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
..
LibraryProvider.cs	Design tools	2017-03-15 16:29:56 -07:00
LibraryProviderFileSystem.cs	All new 1.7.1 changes	2017-05-19 14:39:57 -07:00
LibraryProviderHistory.cs	Remove async modifiers from non-async methods	2015-12-08 16:59:28 -08:00
LibraryProviderPlugin.cs	Changed should be shown not to take a call back.	2016-01-18 10:02:30 -08:00
LibraryProviderQueue.cs	Putting Selection List into QueueData	2016-12-04 12:06:51 -08:00
LibraryProviderSelector.cs	Remove event keyword from private fields	2016-12-29 06:57:42 -08:00
LibraryProviderSqlite.cs	Design tools	2017-03-15 16:29:56 -07:00