Skip to content
Snippets Groups Projects
Commit 7fae6fa7 authored by Biao Wang's avatar Biao Wang
Browse files

Merge branch 'R0156_proposal4' into 'master'

# Conflicts:
#   source/Lib/CommonLib/TypeDef.h
#   source/Lib/DecoderLib/VLCReader.cpp
parents 02848d64 2e7de3b3
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