]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Wed, 26 Oct 2011 03:10:21 +0000 (23:10 -0400)
committerSamual <samual@xonotic.org>
Wed, 26 Oct 2011 03:10:21 +0000 (23:10 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc

Simple merge
Simple merge
Simple merge