Skip to content
Commit 6b9e3c67 authored by hsd's avatar hsd
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'upstream_3gppforge/109-harmonize-head-and-orientation-tracking-xcheck' into 109-harmonize-head-and-orientation-tracking-refvec-review

# Conflicts:
#	lib_rend/ivas_orient_trk.c
parents ea81af1c 3cf0d186
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment