]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cacea31 b7a45ad)
Merge branch 'mirceakitsune/world_cubemaps'
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:47:15 +0000 (16:47 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 05:47:15 +0000 (16:47 +1100)

Trivial merge