Merge branch 'developer' into zmqdata

This commit is contained in:
Dhanya Maliakal committed 2016-10-04 14:43:31 +02:00
commit 39baeade37
2 files changed
-1

No files matched your search

@@ -104,7 +104,6 @@ enum {
F_GET_RATE_CORRECT, /** < get rate correction tau */
F_ACTIVATE, /** < activate/deactivate readout */
F_SET_NETWORK_PARAMETER, /**< set network parameters such as transmission delay, flow control */
F_PROGRAM_FPGA /**< program FPGA */
Binary file not shown.