]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/samual/balancesamual'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 19:08:13 +0000 (20:08 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 19:08:13 +0000 (20:08 +0100)
commit0fb2edb6ae69233f04d66e3e9a32674b601e6963
tree02e7f786cf1fc342ad1fc3c60466684ce97b4dba
parent0dc38ae2f93086eff28e4ca231f436d5a1469b6c
parent9c213c42e2f189151be3fda0cfc13ae07772e12b
Merge remote branch 'origin/samual/balancesamual'

Conflicts:
balanceSamual.cfg
balanceSamual.cfg