deveee bc46c305f3 Solved conflicts before merge hilnius branch ... git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14636 178a84e3-b1eb-0310-8ba1-8eac791a3b58		2013-12-05 17:27:23 +00:00
..
achievements
addons	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
animations	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
audio	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
challenges	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
config	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
graphics	Add two per track parameter for color correction	2013-12-04 16:33:14 +00:00
guiengine	Correct VS compilation (VS 2013 is 18, not 17)	2013-12-04 01:54:54 +00:00
input	Merged uni's branch with trunk. No guarantee that everything works ;)	2013-12-03 23:02:06 +00:00
io	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
items	Merged uni's branch with trunk. No guarantee that everything works ;)	2013-12-03 23:02:06 +00:00
karts	Solved conflicts before merge hilnius branch	2013-12-05 17:27:23 +00:00
modes	Merged uni's branch with trunk. No guarantee that everything works ;)	2013-12-03 23:02:06 +00:00
network	Solved conflicts before merge hilnius branch	2013-12-05 17:27:23 +00:00
online	Fixed VS compilation (MAX_PRIORITY is a #define somewhere), and while	2013-12-03 23:54:11 +00:00
physics	Merged uni's branch with trunk. No guarantee that everything works ;)	2013-12-03 23:02:06 +00:00
race	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
replay	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
states_screens	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
tinygettext	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
tracks	Add two per track parameter for color correction	2013-12-04 16:33:14 +00:00
utils	Solved conflicts before merge hilnius branch	2013-12-05 17:27:23 +00:00
windows_installer	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
Doxyfile	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
Doxyfile_Win	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
main_loop.cpp	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
main_loop.hpp	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
main.cpp	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00
Makefile.am	Merged with trunk, part 1 (due to previous failures I am splitting this	2013-12-02 04:27:55 +00:00