Skip to content
Snippets Groups Projects
Commit 6e137daf authored by Philip Cowan's avatar Philip Cowan
Browse files

Merge branch 'JVET-P0185' of... 

Merge branch 'JVET-P0185' of https://vcgit.hhi.fraunhofer.de/pbcowan/VVCSoftware_vtm into JVET-P0185

# Conflicts:
#	source/Lib/CommonLib/TypeDef.h
#	source/Lib/DecoderLib/VLCReader.cpp
parents 6b54057e d1630f31
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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