]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e2a9f9 3904f03)
Merge remote branch 'origin/master' into fruitiex/balance
authorFruitieX <fruitiex@gmail.com>
Fri, 31 Dec 2010 16:16:41 +0000 (18:16 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 31 Dec 2010 16:16:41 +0000 (18:16 +0200)

Trivial merge