oy f25010d9dd Merge branch 'master' of github.com:teeworlds/teeworlds ... Conflicts: src/game/client/gameclient.cpp src/game/server/gamecontext.cpp		2012-08-19 12:46:24 +02:00
..
client	Merge branch 'master' of github.com:teeworlds/teeworlds	2012-08-19 12:46:24 +02:00
editor	fixed all the errors that the clang static analayzer found	2012-08-17 18:32:56 +02:00
generated	cleaned up code structure a bit	2007-12-15 10:24:49 +00:00
server	Merge branch 'master' of github.com:teeworlds/teeworlds	2012-08-19 12:46:24 +02:00
collision.cpp	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
collision.h	Reverted 1 Letter Refactoring or Edited it to a full name.	2011-02-13 12:57:10 +01:00
gamecore.cpp	cleaned up core events	2012-08-13 10:36:01 +02:00
gamecore.h	cleaned up core events	2012-08-13 10:36:01 +02:00
layers.cpp	changed way of loading the menu map (not save yet)	2012-07-15 18:35:47 +02:00
layers.h	changed way of loading the menu map (not save yet)	2012-07-15 18:35:47 +02:00
localization.cpp	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
localization.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
mapitems.h	fixed problems with RGB images in maps. Closes #962	2012-07-21 11:38:26 +02:00
tuning.h	Updated copyrights	2010-11-20 21:26:06 +01:00
variables.h	removed ui color and ui scale config variables	2012-08-10 17:35:07 +02:00
version.h	changed netversion to 0.7	2012-02-15 01:39:02 +01:00
voting.h	cleaned up Sv_VoteOptionListAdd message	2012-08-19 10:40:30 +02:00