larsbrubaker f1f1dac568 Merge remote-tracking branch 'origin/1.3.0' ... Conflicts: StaticData/PrinterSettings/Me3D/Me2/material/PolyPlusLT.slice Make it clear this is an out not a ref.		2015-07-28 11:51:35 -07:00
..
ControlWidgets	Revise ATX Power submission from peter1960	2015-04-30 15:46:45 -07:00
PrinterConnections	Added new config.ini, material and quality presets as well as Macros for Me3D	2015-07-27 15:14:37 -07:00
TerminalWindow	Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development	2015-06-25 12:26:00 -07:00
EditLevelingSettingsWindow.cs	UI thread is more explicit about what functions it accepts and now accepts no parameter functions.	2015-06-11 12:06:40 -07:00
EditMacrosWindow.cs	UI thread is more explicit about what functions it accepts and now accepts no parameter functions.	2015-06-11 12:06:40 -07:00
EditManualMovementSpeedsWindow.cs	UI thread is more explicit about what functions it accepts and now accepts no parameter functions.	2015-06-11 12:06:40 -07:00
EditTemperaturePresetsWindow.cs	UI thread is more explicit about what functions it accepts and now accepts no parameter functions.	2015-06-11 12:06:40 -07:00
ManualPrinterControls.cs	UI thread is more explicit about what functions it accepts and now accepts no parameter functions.	2015-06-11 12:06:40 -07:00
PrintLevelingPlane.cs	Merge remote-tracking branch 'origin/1.3.0'	2015-07-28 11:51:35 -07:00
TemperatureIndicator.cs	UI thread is more explicit about what functions it accepts and now accepts no parameter functions.	2015-06-11 12:06:40 -07:00
XYZJogControls.cs	Ran code maid against this code.	2015-04-08 15:20:10 -07:00