Ignore:
Timestamp:
Jan 14, 2019 6:45:33 AM (6 years ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc
Children:
593b536d
Parents:
1c98850 (diff), c3fc919 (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 'ESS_GUI' of https://github.com/SasView/sasview into ESS_GUI

File:
1 edited

Legend:

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

    r09b7da68 rc3fc919  
    7575    <addaction name="actionHide_LogExplorer"/> 
    7676    <addaction name="separator"/> 
    77     <addaction name="actionMinimizePlots"/> 
    78     <addaction name="actionClosePlots"/> 
    79     <addaction name="separator"/> 
    8077    <addaction name="actionStartup_Settings"/> 
    8178   </widget> 
     
    129126    <addaction name="actionNext"/> 
    130127    <addaction name="actionPrevious"/> 
     128     <addaction name="separator"/> 
     129     <addaction name="actionMinimizePlots"/> 
     130     <addaction name="actionClosePlots"/> 
    131131   </widget> 
    132132   <widget class="QMenu" name="menuAnalysis"> 
Note: See TracChangeset for help on using the changeset viewer.