diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developerzmq similarity index 53% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developerzmq index c2c348a0a..da7773b92 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developerzmq differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 4b7d37211..91afcf8bc 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: 753290b2289ec7a3dbb153493896f778a7182aae -Revision: 329 -Branch: zmqhandler +Repsitory UUID: a09c2e38a3c790574c89ed675a94c08cbb09f2ee +Revision: 330 +Branch: esrfchanges Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3755 -Last Changed Date: 2018-04-06 14:04:16.000000002 +0200 ./Beb.c +Last Changed Rev: 3787 +Last Changed Date: 2018-04-13 17:36:31.000000002 +0200 ./Beb.c diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 8a07849c0..c5c95a320 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 "753290b2289ec7a3dbb153493896f778a7182aae" +#define GITREPUUID "a09c2e38a3c790574c89ed675a94c08cbb09f2ee" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3755 -#define GITDATE 0x20180406 -#define GITBRANCH "zmqhandler" +#define GITREV 0x3787 +#define GITDATE 0x20180413 +#define GITBRANCH "esrfchanges"