]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 1 Oct 2011 15:30:17 +0000 (11:30 -0400)
committerSamual <samual@xonotic.org>
Sat, 1 Oct 2011 15:30:17 +0000 (11:30 -0400)
commit47cb3c03c101727451165a15f301f2ff1a6f7099
treee24257d1c60d5301502d6be42bac1472537eaaa0
parentd87a53695d97a6586a3356b5eb7acb4ca5c3bdd9
parentbba4978faed0ce7058b1beaf827fd0d6af3fe0c8
Merge remote branch 'origin/master' into samual/hud_updates