]> 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 20:30:16 +0000 (16:30 -0400)
committerSamual <samual@xonotic.org>
Mon, 24 Oct 2011 20:30:16 +0000 (16:30 -0400)
commit1846e8f66dba1522a83fec1b79c02f1c0da570d6
treecaefbffad8520d9bcab402c96acdcf4899af0a08
parent123e28400e2d61bda79a9ed608cb1b45c10a985d
parent2b25166c227ce8c4c6ce20cdd917bf3bbdf8199a
Merge remote branch 'origin/master' into samual/hud_updates
defaultXonotic.cfg