From: Daid <daid303@gmail.com>
Date: Tue, 17 Apr 2012 17:14:48 +0000 (+0200)
Subject: Merge conflic solved
X-Git-Tag: RC3~68^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6885a39be16ceabff508f8497845e1f1b07f09c3;p=cura.git

Merge conflic solved
Merge branch 'master' of github.com:daid/Cura

Conflicts:
	Cura/util/profile.py
---

6885a39be16ceabff508f8497845e1f1b07f09c3
diff --cc Cura/util/profile.py
index 0b903e88,3bdfbb2c..7f999961
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@@ -64,10 -64,8 +64,10 @@@ profileDefaultSettings = 
  	'bridge_material_amount': '100',
  	'raft_margin': '5',
  	'raft_base_material_amount': '100',
--	'raft_interface_material_amount': '100',
- 	'bottom_thickness': '0.0',
++	'raft_interface_material_amount': '100',
+ 	'bottom_thickness': '0.3',
 +	'add_start_end_gcode': 'True',
- 	'gcode_extension': 'gcode',
++	'gcode_extension': 'gcode',
  }
  preferencesDefaultSettings = {
  	'wizardDone': 'False',