GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 ... Conflicts: src/engine/console.h src/engine/server.h src/engine/server/server.cpp src/engine/shared/config_variables.h src/engine/shared/console.cpp src/engine/shared/console.h src/engine/shared/network_server.cpp src/game/client/components/console.cpp src/game/client/components/console.h src/game/client/components/menus_browser.cpp src/game/client/gameclient.cpp src/game/editor/editor.cpp src/game/editor/editor.h src/game/editor/io.cpp src/game/editor/layer_tiles.cpp src/game/editor/popups.cpp src/game/gamecore.cpp src/game/mapitems.h src/game/server/entities/character.cpp src/game/server/entities/laser.cpp src/game/server/gamecontext.cpp src/game/server/gamecontroller.cpp src/game/server/gamecontroller.h src/game/server/gamemodes/ctf.cpp src/game/server/player.cpp src/game/variables.h		2011-08-13 02:01:40 +02:00
..
register.cpp	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
register.h	Merge branch 'master' of git://github.com/oy/teeworlds	2011-05-09 18:36:13 +02:00
server.cpp	Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611	2011-08-13 02:01:40 +02:00
server.h	Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611	2011-08-13 02:01:40 +02:00