Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/home/notification... accepted/tizen/ivi/stable accepted/tizen_generic accepted/tizen_ivi_panda tizen_ivi_panda accepted/tizen/20131023.064031 accepted/tizen/20131023.171112 accepted/tizen/20131112.015237 accepted/tizen/ivi/panda/20140403.015148 accepted/tizen_ivi_stable/20131116.101645 submit/tizen/20131023.055614 submit/tizen_ivi_panda/20140403.011821 submit/tizen_ivi_stable/20131116.100111
authoryoungsub ko <ys4610.ko@samsung.com>
Wed, 23 Oct 2013 05:29:58 +0000 (14:29 +0900)
committeryoungsub ko <ys4610.ko@samsung.com>
Wed, 23 Oct 2013 05:29:58 +0000 (14:29 +0900)
commitabe7e659630557632e15ab7560855b535c4e8c5b
tree45725459a74a42fe5ea46befab1c21f7ec5418ca
parent22075fff68729c4decd90672091c3c4075982435
parent40112f57080d75ed37f32a37d17ba0572a442103
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/home/notification into work

Conflicts:
packaging/notification.spec
src/notification_ipc.c
CMakeLists.txt
include/notification_ipc.h
packaging/notification.spec
src/notification.c
src/notification_ipc.c