-
- Downloads
Merge branch 'develop' into develop
Showing
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- Core/Instrument/IntensityDataFunctions.cpp 5 additions, 5 deletionsCore/Instrument/IntensityDataFunctions.cpp
- Core/StandardSamples/LatticeBuilder.cpp 1 addition, 1 deletionCore/StandardSamples/LatticeBuilder.cpp
- Core/Tools/PyEmbeddedUtils.cpp 3 additions, 3 deletionsCore/Tools/PyEmbeddedUtils.cpp
- Core/Tools/SysUtils.h 0 additions, 1 deletionCore/Tools/SysUtils.h
- GUI/coregui/Models/FitParameterHelper.cpp 1 addition, 1 deletionGUI/coregui/Models/FitParameterHelper.cpp
- GUI/coregui/Models/GUIObjectBuilder.cpp 0 additions, 1 deletionGUI/coregui/Models/GUIObjectBuilder.cpp
- GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp 4 additions, 4 deletionsGUI/coregui/Views/InfoWidgets/ComboSelectorDialog.cpp
- GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp 2 additions, 3 deletionsGUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.cpp
- GUI/coregui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp 3 additions, 3 deletions...gui/Views/InstrumentWidgets/RectangularDetectorWidget.cpp
- GUI/coregui/Views/widgetbox/images/ff_Mesocrystal_32.png 0 additions, 0 deletionsGUI/coregui/Views/widgetbox/images/ff_Mesocrystal_32.png
- GUI/coregui/Views/widgetbox/widgetbox.qrc 1 addition, 0 deletionsGUI/coregui/Views/widgetbox/widgetbox.qrc
- GUI/coregui/Views/widgetbox/widgetbox.xml 1 addition, 1 deletionGUI/coregui/Views/widgetbox/widgetbox.xml
- GUI/coregui/mainwindow/PyImportAssistant.cpp 9 additions, 7 deletionsGUI/coregui/mainwindow/PyImportAssistant.cpp
- ThirdParty/GUI/qcustomplot/qcustomplot.h 1 addition, 1 deletionThirdParty/GUI/qcustomplot/qcustomplot.h
- ThirdParty/GUI/qt-manhattan-style/CMakeLists.txt 2 additions, 2 deletionsThirdParty/GUI/qt-manhattan-style/CMakeLists.txt
- ThirdParty/GUI/qt-manhattan-style/fancyactionbar.cpp 1 addition, 1 deletionThirdParty/GUI/qt-manhattan-style/fancyactionbar.cpp
- ThirdParty/GUI/qt-manhattan-style/settingsutils.cpp 1 addition, 1 deletionThirdParty/GUI/qt-manhattan-style/settingsutils.cpp
- ThirdParty/GUI/qt-manhattan-style/settingsutils.h 0 additions, 0 deletionsThirdParty/GUI/qt-manhattan-style/settingsutils.h
- ThirdParty/GUI/qtpropertybrowser/qttreepropertybrowser.cpp 1 addition, 1 deletionThirdParty/GUI/qtpropertybrowser/qttreepropertybrowser.cpp
Loading
Please register or sign in to comment