Commit e8c640c3 authored by jamesxxiu's avatar jamesxxiu

Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_BMS...

Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_BMS into atmpv_seq_parall_encoding_bf

# Conflicts:
#	source/Lib/EncoderLib/EncSlice.cpp
parents 7a3e10c0 a91b34a3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment