detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-19 11:11:03 +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

12
slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
View File

@@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer
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: 9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7
Revision: 16
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: 2f3dc8d109de8607f3217cf429619073dc9cc60e
Revision: 17
Branch: developer
Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1669
Last Changed Date: 2017-11-20 11:32:02.000000002 +0100 ./firmware_funcs.c
Last Changed Rev: 3397
Last Changed Date: 2017-12-06 19:05:47.000000002 +0100 ./server_funcs.c