]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'samual/weapons' into Mario/weapons
authorMario <mario.mario@y7mail.com>
Sun, 15 Jun 2014 04:54:31 +0000 (14:54 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 15 Jun 2014 04:54:31 +0000 (14:54 +1000)
1  2 
qcsrc/common/weapons/weapons.qh

Simple merge