]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Thu, 30 May 2013 18:53:12 +0000 (04:53 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 30 May 2013 18:53:12 +0000 (04:53 +1000)
commit227b2de30402285fff6b8bfa6f83244f371c90a2
treea7a55e3162dd531f4fea10d6faf814a59b53b89c
parent7a4efec54a8987165d6848b5adf3211d46c389bc
parent75a17800271027908e00e58e4babf037d4d453c5
Merge branch 'master' into Mario/monsters
qcsrc/common/notifications.qh
qcsrc/server/command/sv_cmd.qc