projects / platform / core / uifw / multi-assistant.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e714a0 df339a1)
Merge branch 'tizen_5.5' into tizen
authorJi-hoon Lee <dalton.lee@samsung.com>
Fri, 21 Aug 2020 11:39:12 +0000 (20:39 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Fri, 21 Aug 2020 11:39:12 +0000 (20:39 +0900)
Change-Id: Ieecddd9d3380ae6f592d00316c6679da23bd2726

1  2 
client/ma.c patch | diff1 | diff2 | blob | history
include/multi_assistant.h patch | diff1 | diff2 | blob | history

diff --cc client/ma.c
Simple merge
diff --cc include/multi_assistant.h
Simple merge
Domain: UI Framework / Voice;