Commit 8ff117ed authored by Nan Hu's avatar Nan Hu

Merge branch 'L0392_L0664' of https://vcgit.hhi.fraunhofer.de/nanh/VVCSoftware_VTM into L0392_L0664

# Conflicts:
#	source/Lib/CommonLib/TypeDef.h
parents 979a3735 18c4fce8
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