]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 591137c 4c3cf7e)
Merge branch 'master' into Mario/vehicles
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 00:55:26 +0000 (11:55 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 00:55:26 +0000 (11:55 +1100)
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