]> 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 | combined (merge: b901f5d a3147c2)
Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Wed, 1 Dec 2010 17:16:31 +0000 (19:16 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 1 Dec 2010 17:16:31 +0000 (19:16 +0200)

Trivial merge