]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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
qcsrc/server/autocvars.qh

Simple merge
Simple merge