Merge remote-tracking branch 'origin/master' into samual/orthoview
authorSamual Lenks <samual@xonotic.org>
Thu, 26 Dec 2013 07:23:54 +0000 (02:23 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 26 Dec 2013 07:23:54 +0000 (02:23 -0500)
commit451c0fbf5473c6acc88bafaa0e9c14e5afd3764e
treeaf60c9b09825341da5c8bb4ac94b289a52bd1d7e
parent1039e3d347436a76f55c09d9cb65bc5ab79ac5a4
parentcf8895a5790c2ae048c71e0f53bae6409a5500c1
Merge remote-tracking branch 'origin/master' into samual/orthoview
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh