Merge remote branch 'refs/remotes/origin/fruitiex/conback'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:00:43 +0000 (19:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:00:43 +0000 (19:00 +0200)
commitca4b93ed723cab84606033100e7a75e842222780
tree7541debe25d378dd35453b40c6db87b008fcf67e
parent2fda635a8e57c6805965df3f38d50b182e1dd08f
parentf3f868b8a01a50074a25676be96fa3014bd03855
Merge remote branch 'refs/remotes/origin/fruitiex/conback'
defaultXonotic.cfg