]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 22 Apr 2013 07:54:34 +0000 (17:54 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 22 Apr 2013 07:54:34 +0000 (17:54 +1000)
commit3fcea167998cc6f1c68e9e814beb148afb4393fa
tree3f30f3509a3c1ab48871dd96cf421cd923f24cef
parent1e1bb1f55222b4c939d583e01806e6118ad2e992
parent7ca42daab89f64e8eb9fe54e674537f5a9880b44
Merge branch 'master' into Mario/monsters
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/w_electro.qc