Ignore:
Timestamp:
Oct 11, 2016 11:09:47 AM (8 years ago)
Author:
jhbakker
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
4581ac9, 7949dcf7
Parents:
392056d (diff), 46dfee9 (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' into Jurrian1D, fingers crossed!

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    rbdae317 r46dfee9  
    1111   Menu Bar <menu_bar> 
    1212 
    13    Analysis <analysis> 
     13   Fitting & Other Analyses <analysis> 
    1414    
    15    Tools <tools> 
     15   Tools & Utilities <tools> 
    1616          
    1717   Working with SasView <working> 
Note: See TracChangeset for help on using the changeset viewer.