]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Thu, 26 Mar 2015 07:42:46 +0000 (18:42 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 26 Mar 2015 07:42:46 +0000 (18:42 +1100)
commit879241d7cb263094b5ac485fed4bf88b9f2aea86
treed01a2028dcab72a644c294f8a25dcd21ba468d32
parentdaf778eca4ed89cd364e7700d5a2b77f4de6fd7a
parentf746573dff0cedc83aa8254751fe0e6d829efc93
Merge branch 'master' into Mario/buff_updates
qcsrc/warpzonelib/mathlib.qc
qcsrc/warpzonelib/mathlib.qh