]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e504ba 437d67d)
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)
Deathtypes: port to registry

Yet another merge request

See merge request !234

1  2 
qcsrc/common/triggers/func/door.qc patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/mutator_nades.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/triggers/func/door.qc
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge