]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 9 Oct 2010 08:58:06 +0000 (11:58 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 9 Oct 2010 08:58:06 +0000 (11:58 +0300)
commit80e6b68ddc210f337cae2cee7fdd694ffeb2f19a
treeb0d06fc6eff9994bd95a224e34c809f4b1b6f7f9
parenta69eeebfc4fe8c4fb1c9dc375d5a6b1aa5cf7dbd
parent0f24c7757072f52a9bb0e84f630467b45a46541e
Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance