]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into terencehill/maximized_radar
authorSamual <samual@xonotic.org>
Fri, 14 Oct 2011 18:12:44 +0000 (14:12 -0400)
committerSamual <samual@xonotic.org>
Fri, 14 Oct 2011 18:12:44 +0000 (14:12 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/teamradar.qc

Simple merge
Simple merge
Simple merge
Simple merge