Ignore:
Timestamp:
May 18, 2018 8:02:02 AM (6 years ago)
Author:
celinedurniak <celine.durniak@…>
Branches:
ESS_GUI, 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:
0459591
Parents:
dbba134 (diff), 3aa3351 (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_doc_qresol' into ESS_GUI

File:
1 edited

Legend:

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

    rd4dac80 rd3ee425  
    2525     <y>0</y> 
    2626     <width>915</width> 
    27      <height>22</height> 
     27     <height>26</height> 
    2828    </rect> 
    2929   </property> 
     
    355355  <action name="actionSAS_Resolution_Estimator"> 
    356356   <property name="text"> 
    357     <string>SAS Resolution Estimator</string> 
     357    <string>Q Resolution Estimator</string> 
    358358   </property> 
    359359  </action> 
Note: See TracChangeset for help on using the changeset viewer.