Changeset ed0b796 in sasview for docs/sphinx-docs


Ignore:
Timestamp:
Oct 1, 2016 10:05:16 PM (8 years ago)
Author:
butler
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:
c5a22a85, 311fce5
Parents:
d186319 (diff), e74274ab (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/conf.py

    r86eb046 r9a182b2  
    6262version = '4.0' 
    6363# The full version, including alpha/beta/rc tags. 
    64 release = '4.0b1' 
     64release = '4.0.0' 
    6565 
    6666# The language for content autogenerated by Sphinx. Refer to documentation 
Note: See TracChangeset for help on using the changeset viewer.