]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Tue, 25 Oct 2011 15:02:41 +0000 (11:02 -0400)
committerSamual <samual@xonotic.org>
Tue, 25 Oct 2011 15:02:41 +0000 (11:02 -0400)
commitf896cf4c5da8e2f44fa45e57bb7bdc9a25bd2ad5
tree24bf4ebf5449aab417f5834d0c928a7a65729c54
parent1846e8f66dba1522a83fec1b79c02f1c0da570d6
parentad76a3d4a0a56e4e89bb25541a87893bbd21b91f
Merge remote branch 'origin/master' into samual/hud_updates
qcsrc/client/View.qc
qcsrc/client/hud_config.qc
qcsrc/server/g_world.qc