]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/buffs'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:07:45 +0000 (22:07 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:07:45 +0000 (22:07 +1100)
commit33c60c506532615dba6ce30c3c64ac2fe8b934c0
treeacc5658cdc74385949e64169d658244b37076480
parent615bb68a764d1dc8064077a1c86a349975ad3e5b
parentf05fed142da4a7651282de5aafd8ae8c6b87623e
Merge branch 'Mario/buffs'