GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds ... Conflicts: data/languages/dutch.txt data/languages/french.txt data/languages/german.txt data/languages/russian.txt src/game/server/entities/flag.cpp src/game/server/entities/flag.h src/game/server/gamecontext.cpp src/game/server/gamemodes/ctf.cpp src/game/server/gamemodes/ctf.h src/game/server/gamemodes/dm.cpp src/game/server/gamemodes/dm.h src/game/server/gamemodes/mod.cpp src/game/server/gamemodes/tdm.cpp src/game/server/gamemodes/tdm.h		2010-11-22 00:26:00 +02:00
..
ctf.cpp	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
ctf.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
DDRace.cpp	new Switch System //TODO Rendering Rotation	2010-11-14 02:39:04 +02:00
DDRace.h	new Switch System //TODO Rendering Rotation	2010-11-14 02:39:04 +02:00
dm.cpp	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
dm.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
mod.cpp	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
mod.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
tdm.cpp	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00
tdm.h	made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds	2010-11-22 00:26:00 +02:00