Merge branch 'master' of http://115.29.151.141:3000/lijinwen/ProtocolDecoderStatic

# Conflicts:
#	BaseEnums/Channels.h
#	BaseEnums/DataCheckEnums.h
#	BaseEnums/EdgePulseEnums.h
#	BaseEnums/LogerEnums.h
#	BaseEnums/ProtocolEnums.h
#	BaseEnums/QuantizedEnums.h
#	BaseHelper/CommonHelper.cpp
#	BaseHelper/CommonHelper.h
#	BaseHelper/Constants.h
#	BaseHelper/DataCheckHelper.cpp
#	BaseHelper/DataCheckHelper.h
#	BaseHelper/DecodeDataHelper.cpp
#	BaseHelper/DecodeDataHelper.h
#	BaseHelper/Logger.cpp
#	BaseHelper/Logger.h
#	DecodeEvent.cpp
#	DecodeEvent.h
#	DecodeResult.cpp
#	DecodeResult.h
#	EdgePulse.cpp
#	EdgePulse.h
#	EdgePulseData.cpp
#	EdgePulseData.h
#	ExportMethod.cpp
#	ExportMethod.h
#	ProtocolDecodeBase.cpp
#	ProtocolDecodeBase.h
#	ProtocolRS232/Constants.h
#	ProtocolRS232/Protocol.RS232.Options.h
#	ProtocolRS232/ProtocolRS232Enums.h
#	ProtocolRS232/RS232Decode.cpp
#	ProtocolRS232/RS232Decode.h
#	ProtocolRS232/RS232DecodeEvent.cpp
#	ProtocolRS232/RS232DecodeEvent.h
#	ProtocolRS232/RS232DecodeResult.cpp
#	ProtocolRS232/RS232DecodeResult.h
#	ProtocolRS232/RS232Packet.cpp
#	ProtocolRS232/RS232Packet.h
#	ProtocolRS232/RS232Params.h
#	ProtocolUSB/Constants.cpp
#	ProtocolUSB/Constants.h
#	ProtocolUSB/ProtocolUSBEnums.h
#	ProtocolUSB/SYNC.h
#	ProtocolUSB/USBDecoder.cpp
#	ProtocolUSB/USBDecoder.h
#	ProtocolUSB/USBPacket.cpp
#	ProtocolUSB/USBPacket.h
#	ProtocolUSB/UsbDecodeEvent.cpp
#	ProtocolUSB/UsbDecodeEvent.h
#	ProtocolUSB/UsbDecodeOptions.h
#	ProtocolUSB/UsbDecodeResult.cpp
#	ProtocolUSB/UsbDecodeResult.h
#	QuantizeParams.cpp
#	QuantizeParams.h
#	dllmain.cpp