]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/rainbow_crosshair
authorMario <mario.mario@y7mail.com>
Wed, 8 May 2013 02:07:59 +0000 (12:07 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 8 May 2013 02:07:59 +0000 (12:07 +1000)
1  2 
qcsrc/client/View.qc
qcsrc/client/autocvars.qh

Simple merge
Simple merge