]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 20:42:02 +0000 (22:42 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 20:42:02 +0000 (22:42 +0200)
commitd8bfca85ca07554a1c7be5c508b822a1b4e90978
tree30dc24ff5112f25a699822cf8b1d6eeab0c6bb0a
parented93522cb1b983edc8c6c062ada4bec4a1198365
parentf2e1181ca79b8415e15d91333db3f84655655600
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'