]> 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: f47c5b6 760b360)
Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)

Trivial merge