]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/deathtypes' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Tue, 13 Oct 2015 07:52:46 +0000 (07:52 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Tue, 13 Oct 2015 07:52:46 +0000 (07:52 +0000)
commit6bb4f10f1ed0f3d39e18c03a3db1dd7c8c74f14d
treeb6703b6ed15ed25a2e4c9f896973551e756608d8
parent5e504bae6cfc01a24dd6dc2e673a35d80c8a1759
parent437d67dbc7631d6c49e922990d96461d3ff4b7b2
Merge branch 'TimePath/deathtypes' into 'master'

Deathtypes: port to registry

Yet another merge request

See merge request !234
qcsrc/common/triggers/func/door.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_nades.qc