Skip to content
Commit 5c69af8f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

record manual merge 

Merge branch 'Orange/external-renderer' of forge.3gpp.org:ivas-codec-pc/ivas-codec into shared/external-renderer-orange-updates
parents 58798395 b3e6e7ff
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment