Guillaume P a863757365 Merge remote-tracking branch 'remotes/upstrem/master' into hd-textures-option
Conflicts:
	data/gui/custom_video_settings.stkgui
	src/states_screens/dialogs/custom_video_settings.cpp
2014-05-03 10:32:47 +02:00
..
2011-03-27 01:10:06 +00:00
2014-04-23 19:03:23 -04:00
2013-12-02 04:39:40 +00:00
2013-12-02 04:39:40 +00:00
2013-06-24 01:08:00 +00:00
2014-03-22 19:49:48 -04:00
2013-12-02 04:39:40 +00:00
2013-12-02 04:39:40 +00:00
2013-04-25 22:47:58 +00:00
2013-12-02 04:39:40 +00:00
2013-12-02 04:39:40 +00:00
2012-09-30 14:36:33 +00:00
2013-12-02 04:39:40 +00:00
2013-12-02 04:39:40 +00:00
2013-07-10 22:49:51 +00:00
2013-07-10 22:49:51 +00:00
2012-07-06 03:53:38 +00:00