projects / platform / core / appfw / data-provider-slave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8667fa6 446a882)
Merge ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/data-provider-slave...
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Nov 2014 05:54:46 +0000 (14:54 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Nov 2014 05:55:27 +0000 (14:55 +0900)
Conflicts:
CMakeLists.txt
data/CMakeLists.txt
icon_src/main.c
res/CMakeLists.txt
src/main.c
stub/main.c

Sync with the private master

Change-Id: I8688d72c94c34369a8783fba8d67a2fb194a6e29


Trivial merge
Domain: App Framework / Application Utility;