Neerti 6eece8ac45 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2 ...

Conflicts:
	.travis.yml
	polaris.dme

2015-07-16 22:46:53 -04:00

..

datum_pool.dm

…

files.dm

…

game.dm

…

global_lists.dm

…

icons.dm

…

lists.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge

2015-06-05 22:11:15 -04:00

logging.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-07 10:51:41 +02:00

maths.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

matrices.dm

…

mobs.dm

…

names.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-14 08:21:12 +02:00

sanitize_values.dm

…

text.dm

…

time.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-30 08:59:34 +02:00

turfs.dm

…

type2type.dm

Better num2hex

2015-07-09 22:51:21 -04:00

unsorted.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-07-11 10:58:49 +02:00

vector.dm

…