]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8462cd f5c2ec0)
Merge branch 'master' into mirceakitsune/player_cubemaps
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 23:52:41 +0000 (10:52 +1100)

Trivial merge