Changeset e82a901 in sasview for src/sas/guiframe


Ignore:
Timestamp:
Jun 10, 2015 2:17:59 AM (10 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:
56e99f9
Parents:
7801df8 (diff), f202138 (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

Conflicts:

src/sas/guiframe/documentation_window.py

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/guiframe/gui_manager.py

    r5276eeb r7801df8  
    21662166        # different place than they would otherwise. 
    21672167        from documentation_window import DocumentationWindow 
    2168         DocumentationWindow(self, -1, "index.html", "General Help") 
     2168        DocumentationWindow(self, -1, "index.html", "", "SasView Documentation") 
    21692169 
    21702170    def set_manager(self, manager): 
Note: See TracChangeset for help on using the changeset viewer.