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

..

controlsconfig.cpp

Made it possible to name control presets, and made controls config display the current preset's name if there are multiple to choose from.

2015-05-05 00:38:24 +03:00

controlsconfig.h

Merge branch 'master' into antipodes

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

controlsconfigcommon.cpp

Made it possible to name control presets, and made controls config display the current preset's name if there are multiple to choose from.

2015-05-05 00:38:24 +03:00