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

Merge branch 'ci/loudness-dirac-hrtf' of...

Merge branch 'ci/loudness-dirac-hrtf' of ssh://forge.3gpp.org:29419/ivas-codec-pc/ivas-codec into ci/loudness-dirac-hrtf

# Conflicts:
#	lib_rend/ivas_rom_TdBinauralRenderer.c
#	lib_rend/ivas_rom_binauralRenderer.c
#	lib_rend/ivas_rom_binaural_crend_head.c
#	scripts/binauralRenderer_interface/ivas_rom_TdBinauralRenderer_fx.c
#	scripts/binauralRenderer_interface/ivas_rom_binauralRenderer_fx.c
parents b4d76152 1219caa4
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment