diff --git a/slsDetectorGui/forms/include/ui_form_action.h b/slsDetectorGui/forms/include/ui_form_action.h index c1d019438..b3e6e9318 100644 --- a/slsDetectorGui/forms/include/ui_form_action.h +++ b/slsDetectorGui/forms/include/ui_form_action.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_action.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_detectormain.h b/slsDetectorGui/forms/include/ui_form_detectormain.h index fd2660e9d..5158638a0 100644 --- a/slsDetectorGui/forms/include/ui_form_detectormain.h +++ b/slsDetectorGui/forms/include/ui_form_detectormain.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_detectormain.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_scan.h b/slsDetectorGui/forms/include/ui_form_scan.h index 743b6a19d..10f4d17d7 100644 --- a/slsDetectorGui/forms/include/ui_form_scan.h +++ b/slsDetectorGui/forms/include/ui_form_scan.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_scan.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_tab_advanced.h b/slsDetectorGui/forms/include/ui_form_tab_advanced.h index 3b7a6aeb3..df041713f 100644 --- a/slsDetectorGui/forms/include/ui_form_tab_advanced.h +++ b/slsDetectorGui/forms/include/ui_form_tab_advanced.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_tab_advanced.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_tab_dataoutput.h b/slsDetectorGui/forms/include/ui_form_tab_dataoutput.h index ae0a25cba..c7abde4c0 100644 --- a/slsDetectorGui/forms/include/ui_form_tab_dataoutput.h +++ b/slsDetectorGui/forms/include/ui_form_tab_dataoutput.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_tab_dataoutput.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_tab_debugging.h b/slsDetectorGui/forms/include/ui_form_tab_debugging.h index 43c2d74dc..474aab1cb 100644 --- a/slsDetectorGui/forms/include/ui_form_tab_debugging.h +++ b/slsDetectorGui/forms/include/ui_form_tab_debugging.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_tab_debugging.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_tab_measurement.h b/slsDetectorGui/forms/include/ui_form_tab_measurement.h index a89e27e32..3897fcf81 100644 --- a/slsDetectorGui/forms/include/ui_form_tab_measurement.h +++ b/slsDetectorGui/forms/include/ui_form_tab_measurement.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_tab_measurement.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_tab_plot.h b/slsDetectorGui/forms/include/ui_form_tab_plot.h index 4bfae28f8..3b64ea889 100644 --- a/slsDetectorGui/forms/include/ui_form_tab_plot.h +++ b/slsDetectorGui/forms/include/ui_form_tab_plot.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_tab_plot.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/forms/include/ui_form_tab_settings.h b/slsDetectorGui/forms/include/ui_form_tab_settings.h index ec434171b..bd4c93236 100644 --- a/slsDetectorGui/forms/include/ui_form_tab_settings.h +++ b/slsDetectorGui/forms/include/ui_form_tab_settings.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'form_tab_settings.ui' ** -** Created: Thu Jul 13 14:40:29 2017 +** Created: Tue Jul 25 12:31:25 2017 ** by: Qt User Interface Compiler version 4.8.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 9c579bfc6..3df0af1a8 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repsitory UUID: fb43f6d8d9f933472bc04dd482911a54cb7e021c -Revision: 406 -Branch: developer +Repsitory UUID: 9811b0e5522d40b4d6bafa91b5f5b24ed558f807 +Revision: 408 +Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 406 -Last Changed Date: 2017-07-13 14:38:07.000000002 +0200 ./Makefile.gui +Last Changed Rev: 408 +Last Changed Date: 2017-07-25 12:31:25.000000002 +0200 ./Makefile.gui diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index c733ddf31..595b94482 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "fb43f6d8d9f933472bc04dd482911a54cb7e021c" -//#define SVNREV 0x406 +#define SVNREPUUID "9811b0e5522d40b4d6bafa91b5f5b24ed558f807" +//#define SVNREV 0x408 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x406 -#define SVNDATE 0x20170713 +#define SVNREV 0x408 +#define SVNDATE 0x20170725 //