GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: data/languages/german.txt src/game/client/components/scoreboard.cpp src/game/editor/ed_layer_tiles.cpp src/game/server/entities/character.cpp src/game/server/gamecontext.cpp src/game/server/gamecontroller.cpp src/game/variables.h		2011-01-04 22:37:09 +02:00
..
compile.py	copied refactor to trunk	2010-05-29 07:25:38 +00:00
content.py	Merge branch 'master' of http://github.com/oy/teeworlds	2010-11-18 01:10:59 +02:00
datatypes.py	Show others for ddrace clients.	2010-10-24 14:47:25 +04:00
network.py	Merge branch 'master' of http://github.com/oy/teeworlds	2011-01-04 22:37:09 +02:00