]> 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: d6868c2 12e9034)
Merge branch 'master' into divVerent/waypointeditor-auto
authormand1nga <mand1nga@xonotic.org>
Sun, 4 Dec 2011 16:24:59 +0000 (13:24 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 4 Dec 2011 16:24:59 +0000 (13:24 -0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

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