]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:24:24 +0000 (06:24 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:24:24 +0000 (06:24 +1100)
commitaa0f7079a73a03e31996607597551526db712e4d
tree3da24386b430a8dda287cddb33a7f73bd7c0cae1
parent75a16a543097a05b57763e284d014dc67e01885a
parent3eb37f18f83c9f32e1870442feaa6b9d9bbe4b3e
Merge branch 'master' into mario/monsters
qcsrc/client/hud.qc
qcsrc/server/defs.qh