]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5685dc ede5abf)
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 patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge