skull132 179431115b Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import ...

# Conflicts:
#	code/modules/admin/admin.dm
#	code/modules/admin/admin_verbs.dm

All conflicts cleared. Wind funciton needs a quick redo as a result.

2016-02-01 16:00:54 +02:00

..

example

Remove dbcon_old

2016-01-13 15:56:57 +02:00

names

Removes reference AI names, adds generic names.

2015-12-05 13:32:14 +01:00

.gitignore

Fix for the config .gitignore.

2013-11-17 15:03:50 +00:00