Skip to content
Snippets Groups Projects
Commit f578fcdb authored by Tobias Hinz's avatar Tobias Hinz
Browse files

Merge branch 'master' of https://vigitlab.fe.hhi.de/hinz/VVCSoftware_VTM into JVET-M0055 

# Conflicts:
#	source/Lib/CommonLib/CodingStructure.cpp
#	source/Lib/CommonLib/TypeDef.h
#	source/Lib/EncoderLib/EncSlice.cpp
parents 7f4761de 60f77b96
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 951 additions and 13 deletions
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