]> de.git.xonotic.org Git - voretournament/voretournament.git/commit
Merge branch 'master' into mirceakitsune/weapon_display
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 4 Aug 2011 13:07:45 +0000 (16:07 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 4 Aug 2011 13:07:45 +0000 (16:07 +0300)
commit055ba200edd85cbe204b5e0bf8f6830f8c85af94
tree37d6d6ca0df9c313e6b01256d6f545f9ddf3d6ae
parentd7cdceb62f91977996d1ab0cc7fdd8c3468791b4
parent66699983e40296a9632e507a2f8489d3d1b196cf
Merge branch 'master' into mirceakitsune/weapon_display