detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-12-06 08:44:21 +01:00
commit 2f3dc8d109
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorGui/gitInfo.txt
View File

@ -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: 065ca6f25866959822ece4b6d6649bf3fe759071
Revision: 417
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8
Revision: 437
Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 417
Last Changed Date: 2017-09-15 13:27:18.000000002 +0200 ./src/qTabAdvanced.cpp
Last Changed Rev: 3185
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/qTabSettings.cpp

10
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
//#define SVNREPPATH ""
#define SVNREPUUID "065ca6f25866959822ece4b6d6649bf3fe759071"
//#define SVNREV 0x417
#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
//#define SVNREV 0x3185
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x417
#define SVNDATE 0x20170915
#define SVNREV 0x3185
#define SVNDATE 0x20171206
//

14
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: ea284699983c3811852b1bcea3708d952803020d
Revision: 1611
Branch: zmqchange
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8
Revision: 1627
Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1619
Last Changed Date: 2017-11-27 14:45:39.000000002 +0100 ./slsDetector/slsDetectorBase.h
Last Changed Rev: 3185
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./slsDetector/slsDetectorUtils.h

10
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
#define SVNURLLIB "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "ea284699983c3811852b1bcea3708d952803020d"
//#define SVNREV 0x1619
#define SVNREPUUIDLIB "b498043ea612fa3148bf1d7ea2a39c46092addf8"
//#define SVNREV 0x3185
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Dhanya_Maliakal"
#define SVNREVLIB 0x1619
#define SVNDATELIB 0x20171127
#define SVNREVLIB 0x3185
#define SVNDATELIB 0x20171206
//

15
slsReceiverSoftware/gitInfo.txt
View File

@ -1,10 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7
Revision: 658
Branch: hotfix2
URL: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git
Repsitory UUID: b498043ea612fa3148bf1d7ea2a39c46092addf8
Revision: 687
Branch: 3.0.1
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 663
Last Changed Date: 2017-10-18 15:51:33.000000002 +0200 ./src/UDPStandardImplementation.cpp
Last Changed Rev: 3185
Last Changed Date: 2017-12-06 08:43:21.000000002 +0100 ./src/UDPStandardImplementation.cpp

10
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
#define SVNURL "git@git.psi.ch:sls_detectors_software/slsDetectorPackage.git"
//#define SVNREPPATH ""
#define SVNREPUUID "820bd8c6a08b5ac05dc6e28e6cfd5674f07d57f7"
//#define SVNREV 0x663
#define SVNREPUUID "b498043ea612fa3148bf1d7ea2a39c46092addf8"
//#define SVNREV 0x3185
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x663
#define SVNDATE 0x20171018
#define SVNREV 0x3185
#define SVNDATE 0x20171206
//