asarium 5f23381c07 Merge branch 'master' into antipodes_/sync ...

Conflicts:
	code/cmdline/cmdline.cpp
	code/globalincs/pstypes.h
	code/globalincs/windebug.cpp
	code/graphics/2d.cpp
	code/windows_stub/stubs.cpp

2015-10-31 17:18:29 +01:00

..

controlsconfig.cpp

Fix for loop

2015-08-19 11:26:32 +02:00

controlsconfig.h

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

controlsconfigcommon.cpp

Fix memory leak from Control_config_presets

2015-10-31 14:06:56 +10:00