ddnet/src
GreYFoXGTi 01cc3f4d68 Merge branch 'master' of http://github.com/oy/teeworlds
and fixed Conflicts:
	src/engine/server/register.h
	src/game/server/gamemodes/mod.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-15 20:46:02 +03:00
..
base Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +04:00
engine Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 20:46:02 +03:00
game Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 20:46:02 +03:00
mastersrv copied refactor to trunk 2010-05-29 07:25:38 +00:00
osxlaunch copied refactor to trunk 2010-05-29 07:25:38 +00:00
tools added fix for crash when there is no datadir 2010-08-05 20:34:16 +02:00
versionsrv fixed line endings in some files 2010-08-15 15:34:55 +02:00