- Timestamp:
- Aug 15, 2017 10:19:11 AM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- b682c6a
- Parents:
- 146c669 (diff), d908932 (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. - Location:
- docs
- Files:
-
- 5 added
- 9 edited
- 2 moved
-
sphinx-docs/source/conf.py (modified) (view diffs)
-
pandoc-docs/Makefile (added)
-
pandoc-docs/build_pandoc.py (added)
-
pandoc-docs/source/README.txt (added)
-
sasview/Tutorial.pptx (modified) (view diffs)
-
sasview/Tutorial_SV2.pdf (moved) (moved from docs/sasview/Tutorial_Old.pdf) (view diffs)
-
sasview/Tutorial_SV2.pptx (moved) (moved from docs/sasview/Tutorial_Old.pptx) (view diffs)
-
sasview/Tutorial_SV3.pdf (added)
-
sasview/Tutorial_SV3.pptx (added)
-
sphinx-docs/build_sphinx.py (modified) (view diffs)
-
sphinx-docs/source/dev/dev.rst (modified) (view diffs)
-
sphinx-docs/source/user/analysis.rst (modified) (view diffs)
-
sphinx-docs/source/user/marketplace.rst (modified) (view diffs)
-
sphinx-docs/source/user/menu_bar.rst (modified) (view diffs)
-
sphinx-docs/source/user/tools.rst (modified) (view diffs)
-
sphinx-docs/source/user/user.rst (modified) (view diffs)
Note: See TracChangeset
for help on using the changeset viewer.
