Lars Brubaker fa02130a62 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools ... # Conflicts: # CustomWidgets/DockingTabControl.cs		2017-06-13 15:13:12 -07:00
..
agg-sharp@b57a72d8c9	Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools	2017-06-13 15:13:12 -07:00
MatterSlice@e2b3848cf9	Made a new mapping for pause gcode..	2017-06-08 16:56:19 -07:00