]> 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: 96c3280 86f854c)
Merge branch 'master' into fruitiex/fruitbalance
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 04:17:19 +0000 (06:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 04:17:19 +0000 (06:17 +0200)

Trivial merge