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
..
2015-03-10 13:09:31 +00:00
2016-03-21 11:15:30 +00:00
2015-08-12 16:12:38 +01:00
2015-03-10 13:09:31 +00:00
2015-12-09 16:52:39 +00:00
2015-04-29 10:42:44 +01:00
2015-12-09 16:52:39 +00:00
2016-03-09 16:37:15 +00:00
2015-07-06 14:09:50 +01:00
2016-01-07 11:09:00 +00:00
2015-09-04 08:56:19 +01:00
2015-09-21 08:45:26 +01:00
2016-01-19 10:45:09 +00:00
2015-12-09 16:52:39 +00:00
2015-04-15 17:54:07 +01:00
2015-11-16 17:27:17 +00:00
2015-11-27 09:53:59 +00:00
2016-01-19 10:52:54 +00:00
2015-05-28 10:13:50 +01:00