]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
authorMario <zacjardine@y7mail.com>
Wed, 4 Mar 2015 09:42:53 +0000 (20:42 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 4 Mar 2015 09:42:53 +0000 (20:42 +1100)
commit28be33b3970f98eab4109a5da6b51672e874b9bd
tree3c1de566d004c775406fa405168516bafee8eb1e
parent2551047e04af0aaa4474ad5d5a9a19d77ca55c11
parenta9639f01d55a902f36eb21a84db8ab2cc79a0d39
Merge branch 'Mario/combined_updates' into Mario/combined_viewloc
qcsrc/client/main.qc
qcsrc/client/view.qc