]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitfeb970c673ec3117321754fad37a6552c28ab582
tree2fc12b3557bd5ae0a3ccacc8bd8b17ac92faa0e5
parentd9639cea2ba6c5436670f1baecbe2cf1af0755ee
parent3728996a83b7c8d48efccdce4cf1d0632e324aae
Merge branch 'Mario/combined_viewloc' into Mario/combined_updates