| 
								
								
									 Pieter van der Kloet | 4c9d0563fe | WIP: Implementing the .ui for the DataFilesPage | 2013-03-05 03:13:39 +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 | 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 |  |