]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 8c9698f 0a8a064)
Merge remote branch 'refs/remotes/origin/fruitiex/danceopening'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 10:31:00 +0000 (11:31 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 10:35:00 +0000 (11:35 +0100)

Trivial merge