Skip to content
Snippets Groups Projects
Commit 9f00f584 authored by Yalu Zhang's avatar Yalu Zhang
Browse files

Merge branch 'voicemngr_rdkb' into devel

Head of devel before merging: 7be53608
Head of voicemngr_rdkb to merge:  eaf0318e

Manually fixed conflicts:
libvoice/libvoice.h
libvoice/voice-types.h
line-dect.c
line.c
line.h
ubus.c
ubus.h

Automatically merged:
libvoice/common.c
main.c
parents 7be53608 eaf0318e
No related branches found
No related tags found
No related merge requests found
Pipeline #207149 passed
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment