diff options
| author | Tae-Young Chung <ty83.chung@samsung.com> | 2016-12-05 19:18:04 +0900 |
|---|---|---|
| committer | Tae-Young Chung <ty83.chung@samsung.com> | 2016-12-05 19:18:04 +0900 |
| commit | 7c7e8ff790c089877bb9dfb3f73202a674d484ae (patch) | |
| tree | c4841f30207679c2f7ef714791f3a97abb347095 /include/mv_barcode_generate.h | |
| parent | 9a0e11ed445dfc91a58d68c820b8f7ac00698baa (diff) | |
| parent | 8e1ad8aaffc338fb178ce5e32ed5ad66bb555d69 (diff) | |
| download | mediavision-accepted/tizen/3.0.m2/wearable/20170104.122709.tar.gz mediavision-accepted/tizen/3.0.m2/wearable/20170104.122709.tar.bz2 mediavision-accepted/tizen/3.0.m2/wearable/20170104.122709.zip | |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20161206.052949submit/tizen_3.0.m2/20170104.093749accepted/tizen/3.0/wearable/20161207.011731accepted/tizen/3.0/tv/20161207.011631accepted/tizen/3.0/mobile/20161207.011331accepted/tizen/3.0/ivi/20161207.011837accepted/tizen/3.0/common/20161207.194414accepted/tizen/3.0.m2/wearable/20170104.122709accepted/tizen/3.0.m2/tv/20170104.122322accepted/tizen/3.0.m2/mobile/20170104.121831tizen_3.0_tvtizen_3.0.m2accepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
Conflicts:
mv_face/face/src/FaceRecognitionModel.cpp
mv_face/face/src/mv_face_open.cpp
packaging/capi-media-vision.spec
Change-Id: I807705c9d0d16265f1d1334eeb6ea8e465308963
Diffstat (limited to 'include/mv_barcode_generate.h')
0 files changed, 0 insertions, 0 deletions