]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/notifications
authorMario <mario.mario@y7mail.com>
Thu, 12 Sep 2013 23:55:48 +0000 (09:55 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 12 Sep 2013 23:55:48 +0000 (09:55 +1000)
commit888afb930e9f6183530d5a9fbcab3a10e4cdee10
tree0d73385cb3d61c210cac7d4fb067f6f64138ffd3
parentb7640a59774853da1957c8d6c886c6e62c36861e
parent58784cc8f89429916e30cc059e1eb61aaa31350a
Merge branch 'master' into Mario/notifications
qcsrc/common/notifications.qh
qcsrc/server/mutators/gamemode_onslaught.qc