]> 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: a6a3541 55bcfb8)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Thu, 17 Nov 2011 17:02:24 +0000 (18:02 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 17 Nov 2011 17:02:24 +0000 (18:02 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

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