Merge branch 'tizen_2.4' into tizen_2.4_dev 89/38789/1
authorAnastasia Lyupa <a.lyupa@samsung.com>
Tue, 28 Apr 2015 13:22:35 +0000 (16:22 +0300)
committerAnastasia Lyupa <a.lyupa@samsung.com>
Tue, 28 Apr 2015 13:24:06 +0000 (16:24 +0300)
commit29140f68ea0b525c546a553ca20b4d85e77dd25c
tree449c3f339c3eb88c1425e8c9174ea57249966d2f
parent58e80dee476778026af06702b030d80b667dacbd
parente90a3c167fdf0f8f07c3b1265eac730150ec1f68
Merge branch 'tizen_2.4' into tizen_2.4_dev

Signed-off-by: Anastasia Lyupa <a.lyupa@samsung.com>
Conflicts:
probe_capi/capi_appfw.c

Change-Id: I624f41975009e38a89b20727f779a78cdfb2441f
19 files changed:
Makefile
custom_chart/da_chart.c
helper/common_probe_init.c
helper/dacapture.c
helper/damaps.c
helper/libdaprobe.c
packaging/swap-probe.spec
probe_capi/capi_appfw.c
probe_event/da_event.c
probe_event/keytouch.c
probe_file/da_io_posix.c
probe_file/da_io_stdc.c
probe_graphics/da_evas_gl.c
probe_graphics/da_gles20_native.cpp
probe_memory/libdamemmanage.c
probe_socket/libdasocket.c
probe_third/libdaemon.c
probe_thread/libdasync.c
probe_thread/libdathread.c