diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developerzmq b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer similarity index 99% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developerzmq rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer index da7773b92..086af133d 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developerzmq and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 91afcf8bc..d59f5e74d 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: a09c2e38a3c790574c89ed675a94c08cbb09f2ee -Revision: 330 -Branch: esrfchanges +Repsitory UUID: 5b01b4cbd808a3c43f1ec97032a1020c8f2ce37a +Revision: 331 +Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3787 -Last Changed Date: 2018-04-13 17:36:31.000000002 +0200 ./Beb.c +Last Changed Rev: 3807 +Last Changed Date: 2018-05-02 17:42:08.000000002 +0200 ./Beb.c diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index c5c95a320..17e358a29 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "a09c2e38a3c790574c89ed675a94c08cbb09f2ee" +#define GITREPUUID "5b01b4cbd808a3c43f1ec97032a1020c8f2ce37a" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3787 -#define GITDATE 0x20180413 -#define GITBRANCH "esrfchanges" +#define GITREV 0x3807 +#define GITDATE 0x20180502 +#define GITBRANCH "developer" diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 995b38685..37e641e0a 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index 0475cfcf1..3777da9a4 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: c9675d111a61075ebe4031ec6bdf285a76be0fce -Revision: 142 -Branch: jungfraunew +Repsitory UUID: 5b01b4cbd808a3c43f1ec97032a1020c8f2ce37a +Revision: 144 +Branch: developer Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3777 -Last Changed Date: 2018-04-26 15:44:15.000000002 +0200 ./RegisterDefs.h +Last Changed Rev: 3807 +Last Changed Date: 2018-05-02 17:42:08.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index 12f7a694c..17e358a29 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "c9675d111a61075ebe4031ec6bdf285a76be0fce" +#define GITREPUUID "5b01b4cbd808a3c43f1ec97032a1020c8f2ce37a" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3777 -#define GITDATE 0x20180426 -#define GITBRANCH "jungfraunew" +#define GITREV 0x3807 +#define GITDATE 0x20180502 +#define GITBRANCH "developer"