gregory-diaz dd0a63dd77 Merge remote-tracking branch 'upstream/development' into development		2014-09-05 15:26:33 -07:00
..
SampleParts	Put the circle back to what it is supposed to be.	2014-02-25 10:07:02 -08:00
AboutPage.html	New about page from html is working.	2014-04-23 14:33:44 -07:00
Settings.json	Fix whitelisted makes.	2014-09-03 17:32:38 -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