]> 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: 1734c58 0396c95)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Tue, 29 Nov 2011 14:36:26 +0000 (06:36 -0800)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 29 Nov 2011 14:36:26 +0000 (06:36 -0800)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

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