Ignore:
Timestamp:
Feb 16, 2017 7:40:53 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:
6a9559d
Parents:
dba6e57 (diff), 83d6249 (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:

Conflict resolved

File:
1 moved

Legend:

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

    rdba6e57 rd84bc69  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<ui version="4.0"> 
    3  <class>Dialog</class> 
    4  <widget class="QDialog" name="Dialog"> 
     3 <class>FittingUI</class> 
     4 <widget class="QDialog" name="FittingUI"> 
    55  <property name="geometry"> 
    66   <rect> 
     
    1212  </property> 
    1313  <property name="windowTitle"> 
    14    <string>Dialog</string> 
     14   <string>Fitting Perspective</string> 
     15  </property> 
     16  <property name="windowIcon"> 
     17   <iconset resource="../../../UI/main_resources.qrc"> 
     18    <normaloff>:/res/ball.ico</normaloff>:/res/ball.ico</iconset> 
    1519  </property> 
    1620  <layout class="QGridLayout" name="gridLayout_15"> 
     
    642646  </layout> 
    643647 </widget> 
    644  <resources/> 
     648 <resources> 
     649  <include location="../../../UI/main_resources.qrc"/> 
     650 </resources> 
    645651 <connections/> 
    646652</ui> 
Note: See TracChangeset for help on using the changeset viewer.