# Conflicts:
#	source/Lib/CommonLib/CodingStructure.cpp
#	source/Lib/CommonLib/Unit.cpp
#	source/Lib/DecoderLib/CABACReader.cpp
#	source/Lib/EncoderLib/CABACWriter.cpp
#	source/Lib/EncoderLib/EncCu.cpp
#	source/Lib/EncoderLib/EncModeCtrl.cpp
#	source/Lib/EncoderLib/InterSearch.cpp
#	source/Lib/EncoderLib/IntraSearch.cpp