]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28be33b d9639ce)
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
authorMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:13:45 +0000 (22:13 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:13:45 +0000 (22:13 +1100)

Trivial merge