]> 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: 2d894e6 a0e6c37)
Merge branch 'master' into savagex/techassault
authorFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 17:26:55 +0000 (19:26 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 17:26:55 +0000 (19:26 +0200)

Trivial merge