projects / platform / core / api / image-util.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
include/wearable/image_util.h
include/wearable/image_util_private.h

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

diff --cc include/image_util_private.h
Simple merge
diff --cc packaging/capi-media-image-util.spec
Simple merge
Domain: Multimedia / Imaging;