]> 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: 28486b0 1844e22)
Merge remote branch 'origin/master' into savagex/techassault
authorFruitieX <fruitiex@gmail.com>
Wed, 24 Nov 2010 18:17:36 +0000 (20:17 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 24 Nov 2010 18:17:36 +0000 (20:17 +0200)

Trivial merge