Lars Brubaker 4bb141339e Merge branch '1.5.2' ... Conflicts: ApplicationView/MenuRow/MenuOptionSettings.cs StaticData/Translations/Master.txt		2016-04-14 15:42:42 -07:00
..
SampleParts	Merge branch '1.5.2'	2016-04-14 15:42:42 -07:00
AboutPage.html	Changing copyright to 2016	2016-03-07 17:27:51 -08:00
ReleaseNotes.html	Put in new icons for library	2015-07-24 14:00:27 -07:00
Settings.json	Added Calibration part mappings to Settings.json	2016-01-29 11:57:32 -08: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