]> 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: 7bec16e 1bf2980)
Merge remote branch 'origin/samual/balance'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 12:42:05 +0000 (14:42 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 12:42:05 +0000 (14:42 +0200)

Trivial merge