projects / platform / core / api / image-util.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6fdc290 80b7800)
Merge branch 'tizen_3.0' into tizen 74/108174/1
authorJiyong Min <jiyong.min@samsung.com>
Tue, 3 Jan 2017 07:50:01 +0000 (16:50 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Tue, 3 Jan 2017 07:50:28 +0000 (16:50 +0900)
commit03279b69e659159b0889018fba2bfb8d14bbd431
tree43f24f4af9765d11aa479e674809b9d541fdc1fctree | snapshot
parent6fdc29030fa9de9e92095741d39ac06b53c0bce2commit | diff
parent80b780056e12ca1f808de69c0931832bca96d126commit | diff
Merge branch 'tizen_3.0' into tizen

Conflicts:
include/wearable/image_util.h
include/wearable/image_util_private.h

Change-Id: I577231fd6a55f0ed1acff225a2c8803b73779c86
Signed-off-by: jiyong.min <jiyong.min@samsung.com>
include/image_util_private.h diff1 | diff2 | blob | history
packaging/capi-media-image-util.spec diff1 | diff2 | blob | history
Domain: Multimedia / Imaging;