Conflicts: DSView/pv/data/decoderstack.cpp DSView/pv/data/dsosnapshot.cpp DSView/pv/dock/protocoldock.cpp