Skip to content
Snippets Groups Projects
Commit a8a2aef0 authored by jamesxxiu's avatar jamesxxiu
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jamesxxiu/VVCSoftware_VTM into JVET_L0256_BIO

# Conflicts:
#	source/Lib/CommonLib/TypeDef.h
parents 8352de97 8fa61a05
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment