]> 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: d9639ce 3728996)
Merge branch 'Mario/combined_viewloc' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:14:03 +0000 (22:14 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:14:03 +0000 (22:14 +1100)

Trivial merge