Ignore:
Timestamp:
Apr 25, 2018 4:59:33 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
017b285
Parents:
93c79b5
git-author:
Piotr Rozyczko <rozyczko@…> (03/22/18 14:46:19)
git-committer:
Piotr Rozyczko <rozyczko@…> (04/25/18 04:59:33)
Message:

Merge branch 'ESS_GUI' into ESS_GUI_better_batch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

    r01ef3f7 rd4dac80  
    106106    <addaction name="actionFit_Results"/> 
    107107    <addaction name="separator"/> 
    108     <addaction name="actionChain_Fitting"/> 
    109     <addaction name="separator"/> 
    110108    <addaction name="actionAdd_Custom_Model"/> 
    111109    <addaction name="actionEdit_Custom_Model"/> 
Note: See TracChangeset for help on using the changeset viewer.