Merge branch 'tizen_2.2' into tizen accepted/tizen_3.0.2014.q3_common accepted/tizen_3.0.m14.3_ivi accepted/tizen_3.0_ivi accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable tizen_3.0.2014.q3_common tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common tizen_3.0.m14.2_ivi tizen_3.0.m14.3_ivi tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_3.0_ivi accepted/tizen/ivi/20160218.023303 submit/tizen_common/20140521.163740 submit/tizen_common/20140522.130648 submit/tizen_common/20140522.135644 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_ivi/20140618.000000 submit/tizen_ivi/20140618.000001 submit/tizen_ivi/20140619.000000 submit/tizen_ivi/20140622.000000 submit/tizen_ivi/20140623.000000 submit/tizen_ivi/20140624.064036 submit/tizen_ivi/20140626.125712 submit/tizen_ivi/20140626.130032 submit/tizen_ivi/20140626.144348 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000002 submit/tizen_mobile/20141120.000000 tizen_3.0.2014.q3_common_release tizen_3.0.m14.2_ivi_release tizen_3.0.m14.3_ivi_release tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release tizen_3.0_ivi_release
authorInkyun Kil <inkyun.kil@samsung.com>
Fri, 7 Mar 2014 04:40:23 +0000 (13:40 +0900)
committerInkyun Kil <inkyun.kil@samsung.com>
Fri, 7 Mar 2014 04:44:28 +0000 (13:44 +0900)
commit3f82d6115368fb5a2d799436aecc7b339e6ae373
treeaae4691e32b96803092d39b790b7db2ac7239050
parentbc2fb69c89c2046e58a1cd47a4b59acb43405bfa
parent6060be6994a7a5e46790f0187f023b5dad18429a
Merge branch 'tizen_2.2' into tizen

Conflicts:
packaging/heynoti.spec
heynoti.c
packaging/heynoti.spec