GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds ... Conflicts: src/game/version.h		2011-04-09 22:33:06 +02:00
..
background.png	merged editor over to trunk	2008-01-12 12:27:55 +00:00
checker.png	merged editor over to trunk	2008-01-12 12:27:55 +00:00
cursor.png	new cursor. thanks goes to primevil	2008-01-18 23:23:35 +00:00
entities.png	fixed editor entities	2011-04-09 20:35:34 +02:00
entities_clear.png	Added a new entities_clear	2011-03-16 19:48:16 +02:00
front.png	deepfreeze tiles	2011-01-17 00:38:24 +02:00
speed_arrow.png	Merging the client manually into the server	2010-08-25 17:31:49 +02:00
speedup.png	New Entities by Fisico, I split them and reworked into separate files	2010-12-12 01:05:11 +02:00
switch.png	Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches	2011-01-25 12:05:53 +02:00
tele.png	New Entities by Fisico, I split them and reworked into separate files	2010-12-12 01:05:11 +02:00