pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								38d825b004
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into wizard
							
							
							
							
							
							
							
							Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp 
							
						 | 
						
							2014-05-29 16:42:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								21c406316f
								
							
						 | 
						
							
							
								
								Working on the Settings tab: start the importer/wizard
							
							
							
							
							
						 | 
						
							2014-04-16 16:54:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								3792b301e9
								
							
						 | 
						
							
							
								
								Wizard now runs the ini-importer to import settings from Morrowind.ini
							
							
							
							
							
						 | 
						
							2014-02-25 15:33:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								c54217d008
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into HEAD
							
							
							
							
							
							
							
							Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp 
							
						 | 
						
							2014-02-19 19:26:07 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									pvdk
								
							 
						 | 
						
							
							
							
							
								
							
							
								095ff4e17a
								
							
						 | 
						
							
							
								
								Moved launcher settings stuff into components, so they can be reused in the wizard
							
							
							
							
							
						 | 
						
							2013-12-25 00:50:25 +01:00 | 
						
						
							
							
							
								
							
							
						 |