]> 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: d9ddc39 8c5dfdb)
Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:47:25 +0000 (09:47 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:47:25 +0000 (09:47 +0100)

Trivial merge