Lars Brubaker 4fb4d3a15f Merge remote-tracking branch 'origin/1.6' ... # Conflicts: # Submodules/agg-sharp		2017-01-03 15:22:52 -08:00
..
Io	Include bed heating to recover consideration	2016-12-29 14:51:45 -08:00
PrinterConnectionAndCommunication.cs	Merge remote-tracking branch 'origin/1.6'	2017-01-03 15:22:52 -08:00