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
..
__init__.py	daq: Fixed channel merging	2016-03-21 11:15:30 +00:00