GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace ... Conflicts: src/game/server/gamecontext.cpp		2010-10-16 22:02:34 +02:00
..
register.cpp	added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8	2010-08-25 01:17:02 +02:00
register.h	more cleanup	2010-10-11 03:50:43 +02:00
server.cpp	Merge branch 'master' of http://github.com/heinrich5991/DDRace	2010-10-16 22:02:34 +02:00
server.h	Merge branch 'master' of http://github.com/oy/teeworlds	2010-10-11 03:56:58 +02:00