]> 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 | combined (merge: 902f2e7 5b0b940)
Merge branch 'master' into fruitiex/stormkeep
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 15:20:20 +0000 (17:20 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 15:20:20 +0000 (17:20 +0200)

Trivial merge