Merge remote-tracking branch 'origin/tizen_3.0_dbus' into tizen 40/60740/1
authorHyunho Kang <hhstark.kang@samsung.com>
Wed, 2 Mar 2016 03:05:30 +0000 (12:05 +0900)
committerHyunho Kang <hhstark.kang@samsung.com>
Wed, 2 Mar 2016 03:57:19 +0000 (12:57 +0900)
commit9d69417ba43851c4d3cbd7aefc47e768b0d088de
tree1d56ece279f7e0aa9567e9579f3fe23bcd585365
parent7a921c23eda65df846950442e7f2d284d2c51b13
parent9aa2bf03acb3ef7bb53cc06ad5eb508bb4d5ad1f
Merge remote-tracking branch 'origin/tizen_3.0_dbus' into tizen

Change-Id: Iead6d3307ec8cd81ff24cfaac07695a74880a959
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>
CMakeLists.txt
src/badge_internal.c