]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/fruitiex/glowplant'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 20:50:23 +0000 (22:50 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 20:50:23 +0000 (22:50 +0200)
commit966b4f9d990604e38b7a2b936472062168f2923c
treee39e7a6f9636a2186f5a210fd49c09311d6a1a6f
parent90581246fa480b12e53c8eb12e0349dd2a8c98f3
parent1f5ee6b7fd1aa81f30c944c35d9dab36e47f1a58
Merge remote branch 'refs/remotes/origin/fruitiex/glowplant'