GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds ... Conflicts: src/engine/external/pnglite/pnglite.c src/engine/external/pnglite/pnglite.h src/engine/shared/config_variables.h src/game/client/components/menus_browser.cpp src/game/server/entities/character.cpp src/game/server/entities/laser.cpp src/game/server/gamecontext.cpp src/game/server/player.cpp src/game/version.h		2011-05-09 18:36:13 +02:00
..
client.cpp	Merge branch 'master' of git://github.com/oy/teeworlds	2011-05-09 18:36:13 +02:00
client.h	Merged Oy, Cleaned up, removed some useless features and code parts	2011-04-09 22:32:17 +02:00
friends.cpp	Merged Oy, Cleaned up, removed some useless features and code parts	2011-04-09 22:32:17 +02:00
friends.h	Merge branch 'master' of git://github.com/oy/teeworlds into HEAD	2011-04-14 01:27:49 +02:00
graphics.cpp	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
graphics.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
input.cpp	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
input.h	added cleaner exit on quit event by Choupom	2010-12-11 22:04:50 +01:00
keynames.h	Updated copyrights	2010-11-20 21:26:06 +01:00
serverbrowser.cpp	added strict game type filter	2011-05-02 19:25:38 +02:00
serverbrowser.h	added "Whitespace and line Endings cleanup" by GreYFoX	2011-04-13 20:37:12 +02:00
sound.cpp	added "reimplemented menu music by teetow-the-great-teetow" by Choupom	2011-04-13 20:00:54 +02:00
sound.h	added "reimplemented menu music by teetow-the-great-teetow" by Choupom	2011-04-13 20:00:54 +02:00
text.cpp	fixed compiler warnings. Closes #679	2011-05-05 01:43:27 +02:00