Whitellama 6d8654eb7a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	html/changelog.html

2013-06-30 20:02:36 -07:00

..

client defines.dm

…

client procs.dm

Added extra message when downloading external resources.

2013-06-11 21:28:59 +02:00

preferences_savefile.dm

Secondary language is saved in the char saves

2013-06-29 17:32:48 -04:00

preferences_toggles.dm

…

preferences.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-06-30 20:02:36 -07:00