| 
								
								
									 Pieter van der Kloet | a0007325ad | Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins | 2013-02-25 01:22:14 +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 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | 43e9ad8733 | The text color of the profiles dialog now turns red on invalid names | 2013-02-15 14:26:09 +01:00 |  | 
				
					
						| 
								
								
									 Michal Sciubidlo | f7e5ea24f4 | Merge branch 'startup' into cs_load. Fix include in textinputdialog.cpp. | 2013-02-05 21:23:49 +01:00 |  | 
				
					
						| 
								
								
									 Michal Sciubidlo | 66ec4ca7d9 | Split launcher specific code from DataFilesList back to DataFilesPage. | 2013-02-04 22:14:14 +01:00 |  | 
				
					
						| 
								
								
									 Michal Sciubidlo | f029a9011a | Move datafilespage to shared space. | 2013-01-30 20:21:03 +01:00 |  | 
				
					
						| 
								
								
									 Pieter van der Kloet | fe9120bcb3 | Added support for the profiles and made creation/editing them more user friendly | 2012-10-23 01:47:07 +02:00 |  |