Gregory Diaz 2c5da92c70 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development ... Conflicts: StaticData/SliceSettings/Layouts.txt		2015-04-24 10:40:10 -07:00
..
Drivers	Put in flashforge hardware ids	2015-02-24 16:57:22 -08:00
Fonts
Icons	Adding in the touchscreen icons	2015-04-06 16:01:57 -07:00
OEMSettings	added MakerGear to printer white list	2015-03-30 16:39:53 -07:00
PrinterSettings	added 'Extruder Wipe Temperature' and "Bed Remove Part Temperature" to Slice Settings	2015-04-24 10:25:03 -07:00
SliceSettings	Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development	2015-04-24 10:40:10 -07:00
Sounds
Translations	added 'Extruder Wipe Temperature' and "Bed Remove Part Temperature" to Slice Settings	2015-04-24 10:25:03 -07:00
application.ico
BuildInfo.txt
CuraEngine License.txt
mc.ico
MHDude.png
PartSheetLogo.png