]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:53:35 +0000 (10:53 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:53:35 +0000 (10:53 +1000)
commit660451e2a1499aae45fdf8307244814f6cae79ae
tree691041ab18eeef2a18e35c3aa7b0f81bb0e53310
parente8b6542f46abb4c4ae2afde8d37eff347ab8a33e
parentcfaacd5aff51c88ae76519d019aa6427ba1c5bc0
Merge branch 'master' into Mario/monsters
commands.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_minstagib.qc