Merge branch devel/master (1.0.49) into tizen 74/46374/1 tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_temp accepted/tizen/mobile/20150820.115818 accepted/tizen/mobile/20150820.115841 accepted/tizen/tv/20150820.115913 accepted/tizen/wearable/20150820.120020 submit/tizen/20150820.112512 submit/tizen_common/20151023.083358 submit/tizen_common/20151026.085049 submit/tizen_mobile/20150820.095541 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
authortaeyoon <taeyoon0.lee@samsung.com>
Wed, 19 Aug 2015 08:43:41 +0000 (17:43 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Wed, 19 Aug 2015 13:30:01 +0000 (22:30 +0900)
commitefd80d70751b976b58c37997ca82f5bee9910e03
tree03b254644ec01dce45a85e9cdf394ad9dde49ae6
parent058d41e2f51d4176f993bfa3bd9add7c4d52da57
parent2cc3286222e656e61be7b600845b6bc7cba6e27e
Merge branch devel/master (1.0.49) into tizen

Conflicts:
packaging/com.samsung.dali-demo.spec
Change-Id: I84020ab46ab80fa2b5439c180b295a2a068d1e10