Merge branch 'tizen_2.4' of ssh://spin:29418/apps/home/notification into tizen submit/tizen_mobile/20150527.071719 submit/tizen_mobile/20150529.103300
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 14:12:32 +0000 (23:12 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 14:12:38 +0000 (23:12 +0900)
commit95f315117a095b669242e8825c175950d17f9fa4
tree95cd6931715103e75667c67aa903a919e3afd247
parente2d0fd3305a95ef36c66d31c580bf64c79656059
parent0675c26b3ccb723c39432088e28a1041d4d12260
Merge branch 'tizen_2.4' of ssh://spin:29418/apps/home/notification into tizen

Conflicts:
CMakeLists.txt
include/notification.h
include/notification_internal.h
include/notification_list.h
include/notification_status.h
include/notification_type.h
packaging/notification.spec
src/notification.c
src/notification_noti.c
test-app/CMakeLists.txt
test-app/main.c

Change-Id: I879a434de924aaf724679a42d26f2586ba616fde
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
13 files changed:
CMakeLists.txt
include/notification.h
include/notification_error.h
include/notification_internal.h
include/notification_list.h
include/notification_status.h
include/notification_type.h
packaging/notification.spec
src/notification.c
src/notification_ipc.c
src/notification_noti.c
src/notification_status.c
test-app/main.c