]> 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: 2d77d65 28a041f)
Merge remote branch 'origin/mirceakitsune/cvared_gib_health'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 31 Mar 2011 07:27:22 +0000 (09:27 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 31 Mar 2011 07:27:22 +0000 (09:27 +0200)
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