Merge remote branch 'origin/fruitiex/fruitbalance'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:02:45 +0000 (20:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 18:02:45 +0000 (20:02 +0200)
commit392daf627bb137aadf4c156dc8dfc4906475840e
tree7f658ba0d4f41dccb2fd4bcfecbb37817798a73e
parent669ea85f389d64cf59d47c24f9b447843a4e9d57
parentfa51f49b0ea8f1d6cd378b9be83cfcbd8f37c298
Merge remote branch 'origin/fruitiex/fruitbalance'

Conflicts:
qcsrc/client/View.qc
defaultXonotic.cfg
qcsrc/client/View.qc