Mloc 5faabba7fb Merge branch 'master' into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>

2013-05-16 12:21:55 +01:00

..

client defines.dm

Turn off control_freak for profiling and stuff.

2013-05-15 22:52:25 +02:00

client procs.dm

made hyperspectral analysis images into a client-side resource

2013-05-14 13:07:11 +10:00

preferences_savefile.dm

Fixed glasses

2013-05-16 00:11:57 +04:00

preferences_toggles.dm

Removed mob/var/UI, it now uses client.prefs.UI_style

2012-11-22 15:22:08 +00:00

preferences.dm

Fixed glasses

2013-05-16 00:11:57 +04:00