Changeset 2327399 in sasview for src/sas/qtgui/MainWindow/UI

Timestamp:

Dec 4, 2018 9:22:17 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

3801429

Parents:

a8e6394 (diff), 0989bad (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:

• src/sas/qtgui/MainWindow/UI/MainWindowUI.ui (modified) (2 diffs)

src/sas/qtgui/MainWindow/UI/MainWindowUI.ui

@@ -2 +2 @@
 <ui version="4.0">
  <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
+ <widget class="QMainWindow" name="SasView">
   <property name="geometry">
    <rect>
@@ -12 +12 @@
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>SasView</string>
   </property>
   <property name="windowIcon">