]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit68eeed9d509bed4b50e81f5995065322e23634fa
tree04fa1f7de3ed00982cd4545106507f40d1b8b289
parent3d81bedbad70b7ea613793e7b5913e9bb739ae4c
parent656ec3265b2e70732d9104fd87f339fccf7d0e90
Merge remote branch 'origin/master' into terencehill/maximized_radar
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/teamradar.qc