3 commits

Author	SHA1	Message	Date
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
Magnus Auvinen	8b3c16e615	major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell	2007-08-22 07:52:33 +00:00
Magnus Auvinen	f5c779f81e	added linecount script	2007-08-02 08:21:03 +00:00