ddnet/data/languages
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
..
bosnian.txt 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
czech.txt 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
dutch.txt 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
finnish.txt 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
french.txt 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
german.txt 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
index.txt Added Polish translation 2010-11-19 20:04:58 +01:00
italian.txt 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
polish.txt added localisation updates by Sworddragon 2010-11-21 14:25:00 +01:00
portuguese.txt 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
russian.txt 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
serbian.txt 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
swedish.txt 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