John Lewin 4fd2eee3c7 Merge remote-tracking branch 'origin/1.5.3' ... # Conflicts: # PrinterCommunication/Io/WaitForTempStream.cs		2016-05-19 18:03:57 -07:00
..
Drivers
Fonts
Icons	Working on edit button for printer	2016-05-13 11:37:22 -07:00
OEMSettings	Merge remote-tracking branch 'origin/1.5.3'	2016-05-19 18:03:57 -07:00
PrinterSettings	Merge remote-tracking branch 'origin/1.5.3'	2016-05-19 18:03:57 -07:00
SliceSettings	UI label updates	2016-05-18 12:52:36 -07:00
Sounds
Translations	Put in a delete printer button.	2016-05-17 15:50:43 -07:00
application.ico
BuildInfo.txt
CuraEngine License.txt
mc.ico
MHDude.png
PartSheetLogo.png