projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92dc500 9d89eb5)
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 20 Nov 2010 21:22:51 +0000 (22:22 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 20 Nov 2010 21:22:51 +0000 (22:22 +0100)
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