]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 535736b 5764a54)
Merge remote branch 'origin/fruitiex/dryfirefix'
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 14 Nov 2010 18:46:09 +0000 (19:46 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 14 Nov 2010 18:46:09 +0000 (19:46 +0100)

Trivial merge