Ignore:
Timestamp:
Feb 16, 2017 9:41:02 AM (8 years ago)
Author:
wojciech
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:
1228007
Parents:
d84bc69 (diff), 2bb20a5 (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_sasmodels_dictionary

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

    rd84bc69 r6a9559d  
    1515  </property> 
    1616  <property name="windowIcon"> 
    17    <iconset resource="../../../UI/main_resources.qrc"> 
     17   <iconset> 
    1818    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1919  </property> 
     
    646646  </layout> 
    647647 </widget> 
    648  <resources> 
    649   <include location="../../../UI/main_resources.qrc"/> 
    650  </resources> 
     648 <resources/> 
    651649 <connections/> 
    652650</ui> 
Note: See TracChangeset for help on using the changeset viewer.