]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/turrets
authorMario <mario.mario@y7mail.com>
Wed, 16 Oct 2013 07:20:53 +0000 (18:20 +1100)
committerMario <mario.mario@y7mail.com>
Wed, 16 Oct 2013 07:20:53 +0000 (18:20 +1100)
commit763a9ac7368a483a9babeabe151272b7a87b313e
tree8f6edc1dd041f7ce735a5fb6f61a9bf0d8bbbb30
parent3eebc5bece044d706d3688cd7bad03b4474edb4d
parent6042228a26fd6fe48bf7ee6cb7c284257bb498d9
Merge branch 'master' into Mario/turrets
qcsrc/common/notifications.qh