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
..
include	copied refactor to trunk	2010-05-29 07:25:38 +00:00
vc2005libs	linked the runtime library statically within sdl. Closes #797	2011-07-23 19:54:49 +02:00
sdl.lua	copied refactor to trunk	2010-05-29 07:25:38 +00:00
sdlnotes.txt	Merging the client manually into the server	2010-08-25 17:31:49 +02:00