Merge branch 'feature/5421_IDA_bayes_interface' into develop

Refs #5421 Conflicts: Code/Mantid/scripts/Inelastic/IndirectBayes.py
mantidproject · Sep 26, 2013 · fae01ce · fae01ce
2 parents 3ec2629 + bcdddf6
commit fae01ce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui
@@ -50,17 +50,17 @@
       <widget class="QComboBox" name="cbWidth">
        <item>
         <property name="text">
-         <string>FW11</string>
+         <string>1.1</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>FW21</string>
+         <string>2.1</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>FW22</string>
+         <string>2.2</string>
         </property>
        </item>
       </widget>