projects / platform / core / appfw / widget-viewer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ef9a45 d1fbc29)
Merge branch 'tizen_2.3' of ssh://spin:29418/apps/widget/widget-viewer into tizen accepted/tizen/mobile/20150515.060258 submit/tizen_mobile/20150515.034343
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 15 May 2015 03:42:26 +0000 (12:42 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 15 May 2015 03:42:26 +0000 (12:42 +0900)
Conflicts:
packaging/libwidget_viewer.spec
widget_viewer_evas/src/widget_viewer_evas.c

Change-Id: I9f3dc2ff19850a88f538e1458b773f05fa797d1f

1  2 
widget_viewer_evas/CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc widget_viewer_evas/CMakeLists.txt
Simple merge
Domain: App Framework / Widget;