Merge branch 'divVerent/xact'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 7 Oct 2011 12:06:58 +0000 (14:06 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 7 Oct 2011 12:06:58 +0000 (14:06 +0200)
commit6b70522a4b2e76e6c5c714fb10e5070b65ebd30d
tree328030a059db8e5cb648d2856c693ca7abee42d6
parent66cbc01bb8a5c4962df2a447836841d90329ea29
parent2f60e8694a88d5d470391316052399428209aeeb
Merge branch 'divVerent/xact'