]> 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: 0a79dac c96303a)
Merge remote-tracking branch 'origin/master' into samual/balance
authorFruitieX <fruitiex@gmail.com>
Thu, 19 May 2011 19:38:40 +0000 (22:38 +0300)
committerFruitieX <fruitiex@gmail.com>
Thu, 19 May 2011 19:38:40 +0000 (22:38 +0300)

Trivial merge