scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c1ff8caca
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp 
							
						 | 
						
							2013-03-20 02:29:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								170451cb79
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'graffy76/saveOnClose' into next
							
							
							
							
							
						 | 
						
							2013-03-12 14:47:42 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									graffy76
								
							 
						 | 
						
							
							
							
							
								
							
							
								50abb22162
								
							
						 | 
						
							
							
								
								Fix to allow application closing from multiple views and a single view.
							
							
							
							
							
						 | 
						
							2013-03-12 06:28:13 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e68a420ae
								
							
						 | 
						
							
							
								
								restructuring tes3 record structs
							
							
							
							
							
						 | 
						
							2013-03-12 08:15:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2d522aa4d
								
							
						 | 
						
							
							
								
								Added support for non-latin characters in esx metadata
							
							
							
							
							
						 | 
						
							2013-03-12 04:01:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pieter van der Kloet
								
							 
						 | 
						
							
							
							
							
								
							
							
								7504ae675b
								
							
						 | 
						
							
							
								
								Implemented a file dialog for the editor using launcher .ui
							
							
							
							
							
						 | 
						
							2013-03-07 03:00:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pieter van der Kloet
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c9d0563fe
								
							
						 | 
						
							
							
								
								WIP: Implementing the .ui for the DataFilesPage
							
							
							
							
							
						 | 
						
							2013-03-05 03:13:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pieter van der Kloet
								
							 
						 | 
						
							
							
							
							
								
							
							
								35b68a3c40
								
							
						 | 
						
							
							
								
								Fixed accidental profile deletion and added sorting by date
							
							
							
							
							
						 | 
						
							2013-02-19 15:58:01 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pieter van der Kloet
								
							 
						 | 
						
							
							
							
							
								
							
							
								178cf2154e
								
							
						 | 
						
							
							
								
								Made checking/unchecking work with the new datafiles model
							
							
							
							
							
						 | 
						
							2013-02-18 17:59:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pieter van der Kloet
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd430dc5a9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
							
							
							
							
							
							
							
							Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp 
							
						 | 
						
							2013-02-15 15:38:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Pieter van der Kloet
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee27e3bb58
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/next' into settingsnext
							
							
							
							
							
							
							
							Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp 
							
						 | 
						
							2013-02-15 15:21:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Sciubidlo
								
							 
						 | 
						
							
							
							
							
								
							
							
								f4d60ae7b2
								
							
						 | 
						
							
							
								
								Files sorting (masters then plugins).
							
							
							
							
							
							
							
							Remove unneeded includes. 
							
						 | 
						
							2013-02-10 19:59:25 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Sciubidlo
								
							 
						 | 
						
							
							
							
							
								
							
							
								0df7c7e5c1
								
							
						 | 
						
							
							
								
								Rename mPlugins* to mFiles*
							
							
							
							
							
						 | 
						
							2013-02-10 14:08:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Sciubidlo
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4ed397b2d
								
							
						 | 
						
							
							
								
								Merge plugins and masters list view in openDialog. Simplify datafilesmodel.
							
							
							
							
							
						 | 
						
							2013-02-10 14:02:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Sciubidlo
								
							 
						 | 
						
							
							
							
							
								
							
							
								347a734364
								
							
						 | 
						
							
							
								
								Move OpenDialog to editor and use it in startup dialogue.
							
							
							
							
							
							
							
							Remove debug output from DataFilesList. 
							
						 | 
						
							2013-02-05 22:06:36 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Sciubidlo
								
							 
						 | 
						
							
							
							
							
								
							
							
								66ec4ca7d9
								
							
						 | 
						
							
							
								
								Split launcher specific code from DataFilesList back to DataFilesPage.
							
							
							
							
							
						 | 
						
							2013-02-04 22:14:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michal Sciubidlo
								
							 
						 | 
						
							
							
							
							
								
							
							
								155cca0c9a
								
							
						 | 
						
							
							
								
								Upload missing files.
							
							
							
							
							
							
							
							Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment. 
							
						 | 
						
							2013-02-02 18:36:01 +01:00 | 
						
						
							
							
							
								
							
							
						 |