Changeset 97c60f8 in sasview
- Timestamp:
- Apr 11, 2017 6:10:11 AM (8 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 7b15990, 17c9436, 867aa79, 2f22db9
- Parents:
- 6ca9d90 (diff), ecdd132 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Andrew Jackson <andrew.jackson@…> (04/11/17 06:10:11)
- git-committer:
- GitHub <noreply@…> (04/11/17 06:10:11)
- Files:
-
- 4 added
- 1 deleted
- 18 edited
- 2 moved
-
.gitignore (modified) (view diffs)
-
test/fileconverter/test/export2d.h5 (deleted)
-
Vagrantfile (modified) (view diffs)
-
Vagrantprovision.sh (modified) (view diffs)
-
docs/sasview/Tutorial.pdf (modified) (view diffs)
-
docs/sasview/Tutorial.pptx (modified) (view diffs)
-
docs/sasview/Tutorial_SV2.pdf (moved) (moved from docs/sasview/Tutorial_Old.pdf) (view diffs)
-
docs/sasview/Tutorial_SV2.pptx (moved) (moved from docs/sasview/Tutorial_Old.pptx) (view diffs)
-
docs/sasview/Tutorial_SV3.pdf (added)
-
docs/sasview/Tutorial_SV3.pptx (added)
-
docs/sphinx-docs/build_sphinx.py (modified) (view diffs)
-
docs/sphinx-docs/source/user/tutorial.rst (modified) (view diffs)
-
docs/sphinx-docs/source/user/working.rst (modified) (view diffs)
-
run.py (modified) (view diffs)
-
sasview/logger_config.py (added)
-
sasview/logging.ini (modified) (view diffs)
-
sasview/media/README.txt (modified) (view diffs)
-
sasview/media/Tutorial.pdf (modified) (view diffs)
-
sasview/media/getting_started_with_sasview.pdf (added)
-
sasview/sasview.py (modified) (view diffs)
-
sasview/setup_exe.py (modified) (view diffs)
-
sasview/setup_mac.py (modified) (view diffs)
-
setup.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/gui_manager.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) (view diffs)
Note: See TracChangeset
for help on using the changeset viewer.
