]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sat, 11 May 2013 11:52:36 +0000 (21:52 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 11 May 2013 11:52:36 +0000 (21:52 +1000)
commit210a4fc773244444b68dbbbca5fce8af8e216836
tree6575c5ff973464444ef0493eaeb926a935b6dc42
parent30b44e473eb9b0796743060f57899f8b29a44197
parent8c8a22011714768f8c5b3ac887d0fd099fc08d8b
Merge branch 'master' into Mario/monsters
qcsrc/common/notifications.qh
qcsrc/server/cl_player.qc