larsbrubaker 219b14aaf4 Merge branch '1.2.3' into development		2015-06-06 07:44:47 -07:00
..
SampleParts	Fix the calibration box positioning.	2015-01-13 12:31:54 -08:00
AboutPage.html	Put back in the M115 on start up as that shows us the firmware settings.	2015-01-23 15:41:48 -08:00
Settings.json	Merge branch '1.2.3' into development	2015-06-06 07:44:47 -07:00
Thumbs.db	Added new material and quality presets for Revolution 3d	2014-09-05 15:25:59 -07:00
watermark.png	Changing default watermark image back to the MatterControl logo(set the wrong one in previous commit).	2014-09-02 16:39:10 -07:00