]> 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: ce19777 bab4c29)
Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorRudolf Polzer <divverent@alientrap.org>
Sun, 18 Jul 2010 15:08:16 +0000 (17:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 18 Jul 2010 15:08:16 +0000 (17:08 +0200)

Trivial merge