]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f833c81 f746573)
Merge branch 'master' into Mario/nade_fixes
authorMario <zacjardine@y7mail.com>
Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)

Trivial merge