def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace ... Conflicts: bam.lua data/languages/index.txt src/engine/server/server.cpp src/engine/shared/network_server.cpp src/game/client/components/chat.cpp src/game/client/components/menus_settings.cpp src/game/server/entities/character.cpp src/game/server/gamecontext.cpp src/game/version.h		2013-12-26 18:02:22 +01:00
..
client	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
docs	General whitespace and tab cleanup	2011-08-11 10:59:14 +02:00
external	Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace	2012-04-12 02:09:31 +02:00
server	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
shared	Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace	2013-12-26 18:02:22 +01:00
client.h	Merge branch 'master' of git://github.com/oy/teeworlds into DDRace	2012-01-04 20:10:07 +02:00
config.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
console.h	fixing the console (2)	2012-01-28 11:14:31 +01:00
demo.h	made the demoplayer support 0.6.1 based demos	2013-02-26 00:00:38 +01:00
editor.h	added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115	2011-03-22 00:31:42 +01:00
engine.h	fixed problem with sv_bindaddr on the server	2011-04-04 18:20:05 +02:00
friends.h	1024 friends	2013-10-07 03:54:08 +02:00
graphics.h	Some graphic batching:	2013-02-24 18:23:06 +01:00
input.h	#913	2013-02-24 17:39:31 +01:00
kernel.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
keys.h	Updated copyrights	2010-11-20 21:26:06 +01:00
map.h	Refactoring & fixed WEAPONSPEC_GUN in content.py	2011-02-12 21:18:41 +01:00
masterserver.h	fixed few issues with masters.cfg	2011-07-11 12:00:13 +02:00
message.h	Updated copyrights	2010-11-20 21:26:06 +01:00
server.h	Revert "Revert "Restrict rcon output (east)""	2013-07-31 01:31:53 +02:00
serverbrowser.h	General whitespace and tab cleanup	2011-08-11 10:59:14 +02:00
sound.h	General whitespace and tab cleanup	2011-08-11 10:59:14 +02:00
storage.h	cleaned up content folder creation. Closes #845	2012-01-09 01:38:45 +01:00
textrender.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00