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
..
OptionsMenu	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
PrintItemWrapper.cs	Moved all the easy static localized strings to non-static strings	2017-03-01 13:48:49 -08:00
QueueData.cs	Design tools	2017-03-15 16:29:56 -07:00
QueueDataView.cs	Merge branch 'smash_1.7.1' into design_tools	2017-05-19 14:57:04 -07:00
QueueDataWidget.cs	Add DragDrop support for image content	2017-04-05 19:03:04 -07:00
QueueRowItem.cs	Design tools	2017-03-15 16:29:56 -07:00
WrappedQueueRowItem.cs	Design tools	2017-03-15 16:29:56 -07:00