]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 2 Oct 2013 04:24:15 +0000 (21:24 -0700)
committerMario <mario.mario@y7mail.com>
Wed, 2 Oct 2013 04:24:15 +0000 (21:24 -0700)
commitc150edd2f1cd7f4667d9596a0a52295a993291a8
tree18659d841a15c89002e65a96173d8ace27f5729d
parent9cac2e30b0456afcfd02b4cfb5de949193f4cca7
parentda6d203106fbed094e83502b3c3d649eb276aee3
Merge branch 'master' into Mario/monsters
commands.cfg
qcsrc/common/deathtypes.qh
qcsrc/common/mapinfo.qh
qcsrc/common/monsters/monsters.qh
qcsrc/common/notifications.qh