]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/electrofix'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 26 Dec 2010 21:28:22 +0000 (22:28 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 26 Dec 2010 21:28:22 +0000 (22:28 +0100)
commit3665253d0364d6cca5a50f4ef5b45a814c8da6ec
tree6e238ffb3424224c5d1c637f31441a89d7e86e79
parent43c7abac756bcec847f8b04c1a2d0c50daf0713a
parent0950b54c95c57060727c7b2eba55e69c732953bc
Merge remote branch 'origin/fruitiex/electrofix'