]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Wed, 26 Oct 2011 13:06:25 +0000 (09:06 -0400)
committerSamual <samual@xonotic.org>
Wed, 26 Oct 2011 13:06:25 +0000 (09:06 -0400)
commit1c62f7a27b54573d6f25a6b936026c549df2c6ef
tree18719b794f686315791a7ed92b9f238fb54bc120
parenta629d4364d43ac5a8eccc9f1a360c0c5362520a8
parent2855161bde224eeb01bcffd654d726c3ba0cf73b
Merge remote branch 'origin/master' into samual/balance
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/server/autocvars.qh
qcsrc/server/w_uzi.qc