Commit graph

2 commits

Author SHA1 Message Date
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
Kevin Pope
9faee063eb Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00