Skip to content
Snippets Groups Projects
Commit 0f747e97 authored by xiuxx's avatar xiuxx
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/CommonDef.h
parents fe28cdb0 66ab3812
No related branches found
No related tags found
Loading
Showing
with 369 additions and 30 deletions
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