projects / platform / core / api / mediavision.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a0e11e 8e1ad8a)
Merge branch 'tizen' into tizen_3.0 23/102323/1 accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable tizen_3.0.m2 tizen_3.0_tv accepted/tizen/3.0.m2/mobile/20170104.121831 accepted/tizen/3.0.m2/tv/20170104.122322 accepted/tizen/3.0.m2/wearable/20170104.122709 accepted/tizen/3.0/common/20161207.194414 accepted/tizen/3.0/ivi/20161207.011837 accepted/tizen/3.0/mobile/20161207.011331 accepted/tizen/3.0/tv/20161207.011631 accepted/tizen/3.0/wearable/20161207.011731 submit/tizen_3.0.m2/20170104.093749 submit/tizen_3.0/20161206.052949
authorTae-Young Chung <ty83.chung@samsung.com>
Mon, 5 Dec 2016 10:18:04 +0000 (19:18 +0900)
committerTae-Young Chung <ty83.chung@samsung.com>
Mon, 5 Dec 2016 10:18:04 +0000 (19:18 +0900)
commit7c7e8ff790c089877bb9dfb3f73202a674d484ae
treec4841f30207679c2f7ef714791f3a97abb347095tree | snapshot
parent9a0e11ed445dfc91a58d68c820b8f7ac00698baacommit | diff
parent8e1ad8aaffc338fb178ce5e32ed5ad66bb555d69commit | diff
Merge branch 'tizen' into tizen_3.0

Conflicts:
mv_face/face/src/FaceRecognitionModel.cpp
mv_face/face/src/mv_face_open.cpp
packaging/capi-media-vision.spec

Change-Id: I807705c9d0d16265f1d1334eeb6ea8e465308963
Domain: Multimedia / Media Vision;