]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e771c48 1f22530)
Merge remote branch 'origin/master' into diabolik/strength
authorFruitieX <fruitiex@gmail.com>
Wed, 29 Dec 2010 03:34:25 +0000 (05:34 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 29 Dec 2010 03:34:25 +0000 (05:34 +0200)

Trivial merge