Lars Brubaker c9ee69ac3a Merge branch '1.5.1' of https://github.com/MatterHackers/MatterControl ... Conflicts: Submodules/MatterSlice		2016-02-22 13:27:25 -08: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	Put in new micro z adjust and warning images.	2016-01-08 15:04:59 -08:00
OEMSettings	Remove Thumbs.db	2016-01-29 13:11:25 -08:00
PrinterSettings	Merge branch '1.5.1' of https://github.com/MatterHackers/MatterControl	2016-02-22 13:27:25 -08:00
SliceSettings	Merge pull request #562 from jlewin/convexhull	2016-02-19 17:37:49 -08:00
Sounds	Commit of the code	2014-01-29 19:09:30 -08:00
Translations	Make sure we reset the "Finish Setup..." button after completing print leveling wizard.	2016-02-22 10:24:41 -08:00
application.ico	Added some test code.	2014-04-17 12:21:51 -07:00
BuildInfo.txt	Commit of the code	2014-01-29 19:09:30 -08:00
CuraEngine License.txt	Commit of the code	2014-01-29 19:09:30 -08:00
mc.ico	Commit of the code	2014-01-29 19:09:30 -08:00
MHDude.png	Commit of the code	2014-01-29 19:09:30 -08:00
PartSheetLogo.png	Commit of the code	2014-01-29 19:09:30 -08:00