]> 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:37:07 +0000 (10:37 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 6 Mar 2012 09:37:07 +0000 (10:37 +0100)
commitf9c08b5c298e2604040f6af91f23a85e0e781fa4
treec1be1b6eb04263f9978c926bd18048d4ed33c624
parent54ef76df460d8ec00e5058372b383561e11d04b9
parent73d5ae2090819ad068cd8bae53503d923fef12e7
Merge branch 'master' into divVerent/weapons-field-rewrite