]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 15 Oct 2011 18:35:47 +0000 (14:35 -0400)
committerSamual <samual@xonotic.org>
Sat, 15 Oct 2011 18:35:47 +0000 (14:35 -0400)
commitc1c880cbb7ea0d86739e14d5d997480ba73024c7
treeb355a619e2f57391fb5435dcf54f2572e0f0e1ba
parent4f9149218900484f5d0ee0ab4d6d6b31f96f2be7
parent93a9cae58321216c1e54acfc6eeae6731176502c
Merge remote branch 'origin/master' into samual/hud_updates
defaultXonotic.cfg