Changeset 6a9559d in sasview for src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

Timestamp:

Feb 16, 2017 7:41:02 AM (7 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:

• src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui (modified) (2 diffs)

src/sas/qtgui/Perspectives/Fitting/UI/FittingUI.ui

@@ -15 +15 @@
   </property>
   <property name="windowIcon">
-   <iconset resource="../../../UI/main_resources.qrc">
+   <iconset>
     <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset>
   </property>
@@ -646 +646 @@
   </layout>
  </widget>
- <resources>
-  <include location="../../../UI/main_resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>