]> 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 | compact (merge: f95248d e1ee96d)
Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Thu, 2 Dec 2010 14:08:05 +0000 (16:08 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 2 Dec 2010 14:08:05 +0000 (16:08 +0200)

Trivial merge