]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/weapons-field-rewrite
authorRudolf Polzer <divverent@xonotic.org>
Mon, 5 Mar 2012 13:03:30 +0000 (14:03 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 5 Mar 2012 13:03:30 +0000 (14:03 +0100)
commitcda282ab36a796aa36ef671f87ef7fe00ce82c5e
tree93fbc71716135e1583cd30909908211113816064
parent762698f2d53ba397d2ce58cc6ebb1629b6003a24
parenta1583aefe18df9084bc5645c08d4d8f782e5be50
Merge branch 'master' into divVerent/weapons-field-rewrite