Skip to content
Snippets Groups Projects
Commit a58f8cf4 authored by Rickard Sjöberg's avatar Rickard Sjöberg
Browse files

Merge branch 'master' into 'JVET-O0235_NAL_UNIT_TYPE_CONSTRAINTS'

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h

Cleaning up a #define conflict
parents fdf9ea9a 525fd2d8
No related branches found
No related tags found
No related merge requests found
Showing
with 546 additions and 48 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