Lars Brubaker 352eb792f1 Merge branch 'smash_1.7.1' into design_tools ... # Conflicts: # PartPreviewWindow/View3D/View3DWidget.cs # SlicerConfiguration/SliceSettingsWidget.cs # SlicerConfiguration/SlicingQueue.cs # StaticData/SliceSettings/Properties.json		2017-05-19 14:57:04 -07:00
..
Provider	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
CreateFolderWindow.cs	Remove duplicate .Click event from ButtonBase	2017-01-17 15:31:08 -08:00
LibraryDataView.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
LibraryRowItem.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
LibraryRowItemCollection.cs	Moved TextWidget.GlobalPointSizeScaleRatio -> GuiWidget.DeviceScale	2016-05-06 17:56:27 -07:00
LibraryRowItemPart.cs	Fixed the Macros window to cancel on user closes with the X windows button.	2017-02-03 13:06:08 -08:00
PrintLibraryWidget.cs	Moved drag drop to be in our mouse data rather than mirrored api	2017-04-05 16:25:43 -07:00
RenameItemWindow.cs	Remove duplicate .Click event from ButtonBase	2017-01-17 15:31:08 -08:00