asarium d822f2a467 Merge branch 'master' into antipodes ...

Conflicts:
	code/io/timer.cpp

timer conflict was fixed by using the performance counters of SDL instead of what the OS offers directly

2015-05-08 22:24:36 +02:00

..

eventmusic.cpp

Merge branch 'master' into antipodes

2015-05-03 16:05:56 +02:00

eventmusic.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

gamesnd.cpp

Improve gamesnd modular parsing

2015-05-08 08:48:17 +02:00

gamesnd.h

Trunk sync r9064

2012-07-29 11:40:49 +00:00