#
# ChangeLog for / in sasview
#
# Generated by Trac 1.0.1
# May 9, 2024 7:27:01 AM

Thu, 28 Apr 2016 11:38:05 GMT wojciech [aff7904]
	* build_tools/conda/bumps/meta.yaml (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_linux_build_ver02.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_rhel6_build.sh (modified)
	* build_tools/jenkins_win32_build.bat (modified)
	* build_tools/jenkins_win32_py27_build.bat (modified)
	* build_tools/requirements.txt (modified)
	* check_packages.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/default_categories.json (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* setup.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)

	Conflicts fixed, merged with master


Thu, 28 Apr 2016 11:29:38 GMT wojciech [5881b17]
	* build_tools/jenkins_osx_build.sh (modified)
	* sasview/setup_mac.py (modified)
	* setup.py (modified)

	Setup changes to make mac running


Tue, 26 Apr 2016 10:08:48 GMT trnielsen [259aaa0]
	* build_tools/jenkins_osx_build.sh (modified)

	Update OS_X build script