Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/data-provide... submit/tizen/20131022.035921
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:38:58 +0000 (12:38 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:38:58 +0000 (12:38 +0900)
commit83db01d0a2fc74a040693a9febea36994871786b
treed0f41765fd539b3725ae0d27b5084ac7d669a9b6
parent9ce1ccaef997a9832608daeeed8c6805e0570d23
parent51497ecf16867c5c8d8f4210823125cf1c2c8df7
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/data-provider-master into work

Sync with the tizen 2.2 latest code.
systemd socket activation for notification service is now disabled temporarly.
After implement the systemd:// schema from the com-core, it will be able to enabled again.
I keep the .sockets service file, but it cannot be work because of com-core.

Conflicts:
CMakeLists.txt
data-provider-master.manifest
include/conf.h
packaging/data-provider-master.spec
src/event.c
src/main.c
src/parser.c
src/service_common.c
util_liveinfo/src/liveinfo.c

Change-Id: I907b79843769778164f4ad8561537dbb15293857
CMakeLists.txt
packaging/data-provider-master.spec
src/parser.c