larsbrubaker 85771ced2a Merge branch 'master' of https://github.com/MatterHackers/MatterControl ... # Conflicts: # SlicerConfiguration/SettingsControlSelectors.cs		2016-05-07 20:30:25 -07:00
..
Drivers	Including Ghostscript to allow for loading of PDFs	2016-01-22 13:40:39 -08:00
Fonts	Pun in a braille font	2015-09-15 17:45:48 -07:00
Icons	Made all the icons black rather than white on transparent.	2016-05-07 20:06:43 -07:00
OEMSettings	Merge branch '1.5.2'	2016-04-14 15:42:42 -07:00
PrinterSettings	Merge branch '1.5.3'	2016-05-04 14:28:29 -07:00
SliceSettings	Fixes #707 Double press pause button causes fail	2016-05-04 12:14:10 -07:00
Sounds
Translations	Merge branch 'master' of https://github.com/MatterHackers/MatterControl	2016-05-07 20:30:25 -07:00
application.ico
BuildInfo.txt
CuraEngine License.txt
mc.ico
MHDude.png
PartSheetLogo.png