detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-01 22:54:56 +01:00
Code Issues Actions Packages Releases Activity

solved conflicts from merge of version being used to binary

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-06 19:07:06 +01:00
parent 2f3dc8d109 bf9905ad2a
commit 24c305ec59
47 changed files with 292 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@@ -152,8 +152,8 @@ void slsReceiverTCPIPInterface::stop(){
int64_t slsReceiverTCPIPInterface::getReceiverVersion(){
int64_t retval = SVNREV;
retval= (retval <<32) | SVNDATE;
int64_t retval = GITREV;
retval= (retval <<32) | GITDATE;
return retval;
}