]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/common/notifications.qh

Simple merge