]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit0f060ee04a520b3692340198b22fa6184181c827
tree1aaa36b7c8e6bbf5183cdb40eecb9b49be8bfc99
parentf5685dc712cda2a82063500c6fbe0f6db0c463b9
parentede5abf38f36b3103b6e5170b6185b17652ce412
Merge branch 'master' into Mario/rainbow_crosshair
qcsrc/client/View.qc
qcsrc/client/autocvars.qh