52 commits

Author	SHA1	Message	Date
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
Choupom	0c6f187e3b	renamed editor files	2011-05-03 18:45:42 +02:00

Renamed from src/game/editor/ed_popups.cpp (Browse further)