]> 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: 0910e95 6b88b46)
Merge remote branch 'origin/fruitiex/dance_delete_flyingbarrel'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:18:14 +0000 (15:18 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 7 Nov 2010 14:18:14 +0000 (15:18 +0100)

Trivial merge