]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Fri, 29 Dec 2017 10:16:19 +0000 (20:16 +1000)
committerMario <mario@smbclan.net>
Fri, 29 Dec 2017 10:16:19 +0000 (20:16 +1000)
commit89c6c609a4b1ea4f699de0272dc5448c3fed9466
tree3e02c64cabcc636007482d202aba1b632720138f
parentf30bd042a7a34ff1a55ffe6f1907ca04d30e2e6b
parenta3b5728a6344a1637a53cac2e7473656d583913f
Merge branch 'master' into Mario/monsters
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/notifications/all.inc