Merge branch 'tizen_2.4_dev' into tizen 59/70159/1 accepted/tizen/common/20160525.155748 accepted/tizen/ivi/20160525.003335 accepted/tizen/mobile/20160525.003309 accepted/tizen/tv/20160525.003328 accepted/tizen/wearable/20160525.003320 submit/tizen/20160524.083432
authorDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 17 May 2016 14:22:21 +0000 (17:22 +0300)
committerDmitry Kovalenko <d.kovalenko@samsung.com>
Tue, 17 May 2016 14:22:21 +0000 (17:22 +0300)
commit302ea17d2146d79de975d74eaa84b3488bcd634f
tree0354361fe83e15a39834897e9426f5ca4fa439f8
parent324d0df6607a739fae9c81d5bbcfa3355267cf04
parent5604e1a36d6b2fa460acc79d0f70b2dd54b880c5
Merge branch 'tizen_2.4_dev' into tizen

Change-Id: Ib4cee57f1ac18ffd2879d8f7f9abd3a34c7f0d22
Makefile
custom_chart/da_chart.c
helper/libdaprobe.c
include/dahelper.h
include/daprobe.h
probe_capi/capi_appfw.c
probe_event/da_event.c
probe_file/da_io.h
probe_socket/libdasocket.c