Lars Brubaker 3fc69a7e81 Merge branch '1.7' into design_tools ... # Conflicts: # StaticData/Translations/Master.txt		2017-04-12 18:28:16 -07:00
..
Drivers
Fonts
Icons	Add demo image	2017-03-28 11:05:51 -07:00
Images	Improved theme colors	2017-02-15 12:14:36 -08:00
OEMSettings
PrinterSettings/JumpStart/V1	Design tools	2017-03-15 16:29:56 -07:00
Profiles
SliceSettings	Merge branch '1.7' into design_tools	2017-04-12 18:28:16 -07:00
Sounds
Translations	Put in default value for use_g30_for_bed_probe	2017-04-12 12:47:40 -07:00
application.ico
BuildInfo.txt
CuraEngine License.txt
MatterControl EULA.txt
mc.ico
MHDude.png
PartSheetLogo.png