Changeset a2ccd569 in sasview for docs/sphinx-docs


Ignore:
Timestamp:
Mar 19, 2016 11:32:11 AM (9 years ago)
Author:
smk78
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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
38e88e0
Parents:
a407a40 (diff), ef908db (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.
Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

File:
1 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/user/user.rst

    r45dfa47e ra407a40  
    77   :maxdepth: 1 
    88 
    9    Model Documentation <models/olddocs/model_functions> 
     9   Old SasView Model Documentation <models/olddocs/model_functions> 
     10    
     11   New SasModels Model Documentation <index> 
    1012    
    1113   Tools <tools> 
Note: See TracChangeset for help on using the changeset viewer.