#
# ChangeLog for / in sasview
#
# Generated by Trac 1.0.1
# May 21, 2024 8:46:03 PM

Fri, 07 Sep 2018 14:11:37 GMT ibressler [9ba91b7]
	* src/sas/qtgui/MainWindow/DataExplorer.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/ModelThread.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py (modified)

	Merge branch 'ESS_GUI' into ESS_GUI_iss1033

	- fixed the conflicts ...


Fri, 07 Sep 2018 13:40:56 GMT GitHub <noreply@…> [4ea8020]
	* src/sas/qtgui/Calculators/SldPanel.py (modified)
	* src/sas/qtgui/Calculators/UI/SldPanel.ui (modified)
	* src/sas/qtgui/MainWindow/DataExplorer.py (modified)
	* src/sas/qtgui/MainWindow/GuiManager.py (modified)
	* src/sas/qtgui/MainWindow/UI/MainWindowUI.ui (modified)
	* src/sas/qtgui/Perspectives/Fitting/FittingLogic.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/ModelThread.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/OptionsWidget.py (modified)
	* src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified)
	* src/sas/qtgui/Plotting/Plotter.py (modified)
	* src/sas/qtgui/Utilities/AddMultEditor.py (modified)
	* src/sas/qtgui/Utilities/GuiUtils.py (modified)
	* src/sas/qtgui/Utilities/LocalConfig.py (modified)
	* src/sas/qtgui/Utilities/ReportDialog.py (modified)
	* src/sas/qtgui/Utilities/UnitTesting/ReportDialogTest.py (modified)

	Merge branch 'ESS_GUI' into ESS_GUI_iss966


Fri, 07 Sep 2018 13:33:57 GMT Torin Cooper-Bennun <torin.cooper-bennun@…> [0109f2a]
	* src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified)

	fix crash in iterateOverMagnetModel