Sebastian Goscik
15ced50640
daq: Fixed channel merging
Fixed channel merging when setting merge to True.
Channel merges done by setting a mapping manually were not affected by this bug.
2016-03-21 11:15:30 +00:00
..
2016-02-29 17:26:29 +00:00
2016-02-22 09:45:42 +00:00
2016-02-17 17:24:14 +00:00
2016-02-02 09:29:22 +00:00
2016-01-22 10:40:03 +00:00
2016-03-21 11:15:30 +00:00
2016-02-04 15:42:35 +00:00
2016-01-22 12:19:31 +00:00
2016-02-04 16:08:22 +00:00
2016-02-04 15:36:47 +00:00
2015-03-10 13:09:31 +00:00
2016-02-22 09:45:42 +00:00
2016-03-15 14:38:18 +00:00
2015-03-10 13:09:31 +00:00
2015-03-10 13:09:31 +00:00
2015-03-10 13:09:31 +00:00
2015-07-02 12:17:19 +01:00
2015-03-10 13:09:31 +00:00