]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Thu, 25 Apr 2013 17:37:27 +0000 (03:37 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 25 Apr 2013 17:37:27 +0000 (03:37 +1000)
commitf4e8e144a9c8e6f1774313edba5fc6c7ecfc2335
treeb3ce0c4b7cd3162c686b8e393c987c8984a9105c
parente163852e1147a86869024e2db1b6adb6d14fb340
parent579290d658345d63f4bf28429e0af71c488084c8
Merge branch 'master' into Mario/mutator_minstagib
qcsrc/common/notifications.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/t_items.qc
qcsrc/server/w_common.qc
qcsrc/server/w_minstanex.qc