]> 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: 0feb3f0 d334d3e)
Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Mon, 3 Jan 2011 20:26:38 +0000 (22:26 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 3 Jan 2011 20:26:38 +0000 (22:26 +0200)

Trivial merge