Merge branch 'tizen_2.4' into tizen_3.0
authorRafal Galka <r.galka@samsung.com>
Tue, 30 Jun 2015 07:40:25 +0000 (09:40 +0200)
committerRafal Galka <r.galka@samsung.com>
Tue, 30 Jun 2015 07:40:25 +0000 (09:40 +0200)
commit4fe9f7f249e4be1d320a349074e0d6f893bc0e9c
treeb66edb79ad961dd2e9cafd88808cd076aa60043a
parentc50061b2a0fd0061b5b99d73003faac319563f7b
parenta6c51341435d2a2b86c091a4d585696c002e4e25
Merge branch 'tizen_2.4' into tizen_3.0

Change-Id: I0d6bd8d574e27473e84d8fe407b112957c18bf2f
14 files changed:
packaging/webapi-plugins.spec
src/application/application_manager.cc
src/common/extension.cc
src/datacontrol/datacontrol_instance.cc
src/messaging/DBus/EmailSignalProxy.h
src/messaging/MsgCommon/FilterIterator.h
src/messaging/email_manager.h
src/messaging/messaging.gyp
src/package/package_info_provider.cc
src/power/power_manager.cc
src/sound/sound_manager.cc
src/systeminfo/systeminfo-utils.cpp
src/systeminfo/systeminfo.gyp
src/utils/utils_instance.cc