pvdk bf6103a3a4 Merge branch 'wizardtab' into wizard ... Conflicts: files/ui/mainwindow.ui		2014-03-30 23:16:48 +02:00
..
wizard	Improved existing installation handling	2014-03-17 18:28:05 +01:00
contentselector.ui	Reimplemented constentselector view class	2013-10-22 21:52:35 -05:00
datafilespage.ui	Reimplemented constentselector view class	2013-10-22 21:52:35 -05:00
filedialog.ui	Fix for file path issues	2013-10-26 22:55:44 -05:00
graphicspage.ui	use SDL for resolution -> multimonitor support	2013-06-23 03:49:30 +02:00
mainwindow.ui	Merge branch 'wizardtab' into wizard	2014-03-30 23:16:48 +02:00
playpage.ui	Fix for duplicate key/value pairs being written to settings.cfg, Bug #755	2013-06-02 21:43:22 +02:00
settingspage.ui	Added a settings page to the launcher	2014-01-27 20:14:02 +01:00