nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mattercontrol/StaticData
History
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 Commit of the code 2014-01-29 19:09:30 -08:00
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 Commit of the code 2014-01-29 19:09:30 -08:00
Translations Changed Changing some delegate defs to use EventHandler<> instead. 2015-06-24 16:59:10 -07: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