tkdrg 90d9dddf39 Merge remote-tracking branch 'upstream/master' into hiasl ...

Conflicts:
	code/modules/client/client procs.dm

2014-10-29 01:27:08 -03:00

..

client defines.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

client procs.dm

Merge remote-tracking branch 'upstream/master' into hiasl

2014-10-29 01:27:08 -03:00

preferences_savefile.dm

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00

preferences_toggles.dm

Adds a separate preference for whispers. Fixed #4658 Fixed #4712

2014-09-07 14:29:58 +02:00

preferences.dm

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00