mattercontrol/PrinterControls/ControlWidgets
larsbrubaker 6590583d19 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	PrinterControls/ManualPrinterControls.cs
2014-10-15 17:11:20 -07:00
..
AdjustmentControls.cs Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00
ControlWidgetBase.cs Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00
FanControls.cs Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00
MacroControls.cs Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00
MovementControls.cs Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00
TemperatureControls.cs Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-15 17:11:20 -07:00