]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
committerSamual <samual@xonotic.org>
Mon, 24 Oct 2011 03:34:19 +0000 (23:34 -0400)
commitd6c299cb1afbff219ff1d7dc737ec1a75a277f8f
treea1d91be7954da88fdb990b7cfcc950de0681b399
parent9a41842c89f620a0cae9e11dc33aa70cc9dd8e72
parentbc69db0a061dd2ff086d50bfd9dc57ad20fb0cf3
Merge remote branch 'origin/master' into samual/hud_updates
defaultXonotic.cfg
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc