]> 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: 00057ff aa9e633)
Merge remote-tracking branch 'origin/samual/balance'
authorJakob MG <jakob_mg@hotmail.com>
Tue, 12 Apr 2011 17:14:12 +0000 (19:14 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 12 Apr 2011 17:14:12 +0000 (19:14 +0200)

Trivial merge