Matt Moening dd0fda52c6 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development ... Conflicts: Submodules/MatterSlice Resolved: Using theirs		2015-07-01 11:44:56 -07:00
..
Drivers	Added the ids for the dremel printer	2015-07-01 11:42:02 -07:00
Fonts
Icons	Remove spacer from library button row.	2015-06-30 17:52:47 -07:00
OEMSettings	removed Wanhao USA from printer whitelist	2015-06-09 16:17:59 -07:00
PrinterSettings	Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development	2015-06-25 12:26:00 -07:00
SliceSettings	Good feedback about redundant naming. Eliminated a bunch of 'Settings' names.	2015-06-05 11:17:28 -07:00
Sounds
Translations	Changed Changing some delegate defs to use EventHandler<> instead.	2015-06-24 16:59:10 -07:00
application.ico
BuildInfo.txt
CuraEngine License.txt
mc.ico
MHDude.png
PartSheetLogo.png