]> 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: 0b01af3 591e13c)
Merge remote-tracking branch 'origin/master' into divVerent/csad
authorSamual Lenks <samual@xonotic.org>
Tue, 11 Dec 2012 22:17:48 +0000 (17:17 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 11 Dec 2012 22:17:48 +0000 (17:17 -0500)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

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