John Lewin 4fd2eee3c7 Merge remote-tracking branch 'origin/1.5.3' ... # Conflicts: # PrinterCommunication/Io/WaitForTempStream.cs		2016-05-19 18:03:57 -07:00
..
SampleParts	Merge branch '1.5.2'	2016-04-14 15:42:42 -07:00
AboutPage.html
ReleaseNotes.html
Settings.json	Added BCN to printer white list	2016-05-13 17:42:04 -07:00
watermark.png