]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sat, 5 Aug 2017 10:05:12 +0000 (20:05 +1000)
committerMario <mario@smbclan.net>
Sat, 5 Aug 2017 10:05:12 +0000 (20:05 +1000)
commitbc38004537ee56b108f2d4d37d59d3bb2408cb4c
tree530d8c612112420879928045c5175d925ecde268
parentf811e82aeffc823c1e1de561bccad58ae4fc3fc8
parent19e5fa4ee9a0bb59c1cec92a1b0501b14f8ccb63
Merge branch 'master' into Mario/monsters
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/notifications/all.inc