]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/weapons-field-rewrite
authorRudolf Polzer <divverent@xonotic.org>
Tue, 6 Mar 2012 09:23:45 +0000 (10:23 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 6 Mar 2012 09:23:45 +0000 (10:23 +0100)
commit54ef76df460d8ec00e5058372b383561e11d04b9
tree1a9997a0bb2cbf3249b5d5a3c7379234fea78970
parentc268729062867494d5d09d14dc2c72c39af391ca
parent2503b3e0b8401288516d64ac85c3f41bc7a7cb9c
Merge branch 'master' into divVerent/weapons-field-rewrite