]> git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Merge branch 'mirceakitsune/customizable_hud'
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 3 Feb 2013 00:40:34 +0000 (02:40 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 3 Feb 2013 00:40:34 +0000 (02:40 +0200)

Trivial merge