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
132 Commits 45 Branches 100 Tags
Commit Graph

10 Commits

Author SHA1 Message Date
Dhanya Maliakal
e9a301dd97 merge master into partial_Frames, including changes of propix 2015-07-29 10:23:35 +02:00
Dhanya Maliakal
fa156f337e sorta done without missing packet identifiers 2015-07-28 18:15:09 +02:00
Dhanya Maliakal
4e52096991 included propix receiver 2015-07-21 16:25:56 +02:00
Dhanya Maliakal
476d1b452f some changes 2015-07-10 16:04:29 +02:00
Anna Bergamaschi
cd67991357 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2015-03-06 10:43:22 +01:00
Anna Bergamaschi
c7aea8f2a6 Some changes for the JCTB software 2015-03-06 10:43:05 +01:00
Dhanya Maliakal
2f82469531 fifo debug with color done 2015-03-05 15:21:12 +01:00
Anna Bergamaschi
1d5580b0d4 JMCB max frames 2014-11-25 11:54:54 +01:00
Leonardo Sala
7c51b06777 Merge branch 'master' into eiger_receiver 
Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles
 2014-11-11 15:54:12 +01:00
Sala Leonardo
27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00