]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/gameover_stuff
authorterencehill <piuntn@gmail.com>
Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 13 Sep 2016 20:56:35 +0000 (22:56 +0200)
commitff024dad9985f1adf868547dbbcefdcaadbe9d1c
tree3d2bb88937c467d6bac0d660cefd06d222f28a5b
parent25570b9609d8f791324e86b659b53b8fcf18b193
parent3a8a8ff32de85c4a28b9108e93f5dbb4c21c3ad7
Merge branch 'master' into terencehill/gameover_stuff
qcsrc/server/mutators/mutator/gamemode_assault.qc