Merge branch 'feature/7614_interface_categories' into develop

Refs #7614. Conflicts: Code/Mantid/MantidPlot/src/ApplicationWindow.h
mantidproject · Oct 25, 2013 · 5208b69 · 5208b69
2 parents b5ba0a0 + 66f1940
commit 5208b69
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.h b/Code/Mantid/MantidPlot/src/ApplicationWindow.h
@@ -1401,9 +1401,8 @@ public slots:
   QWidgetList *hiddenWindows;
   QLineEdit *info;
 
-
   QWidget* icatsearch;
-  
+
   QMenu *windowsMenu, *foldersMenu, *view, *graph, *fileMenu, *format, *edit, *recent, *interfaceMenu;
   QMenu *help, *plot2DMenu, *analysisMenu, *multiPeakMenu, *icat;
   QMenu *matrixMenu, *plot3DMenu, *plotDataMenu, *tablesDepend, *scriptingMenu;