]> 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: 8970cfb d32f58f)
Merge remote-tracking branch 'origin/samual/balance'
authorJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 22:51:08 +0000 (00:51 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 22:51:08 +0000 (00:51 +0200)

Trivial merge