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

..

wizard

Added some nice error messages to the installation process

2014-01-28 01:03:47 +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

Added version information to the launcher

2014-01-22 17:51:10 +01:00

playpage.ui

Fix for duplicate key/value pairs being written to settings.cfg, Bug #755

2013-06-02 21:43:22 +02:00