Merge from master.
authorKeebum Kim <keebum.kim@samsung.com>
Tue, 9 Apr 2013 07:47:13 +0000 (16:47 +0900)
committerKeebum Kim <keebum.kim@samsung.com>
Tue, 9 Apr 2013 07:47:13 +0000 (16:47 +0900)
commit5ce939b1b399cebc48b9a014de3321446162cdee
treecbbba2b517ffdbe2e676ecc42d5776cc039dba8d
parent8beb9f33dbf98dda5e52d7710873f2b25fe6db2d
Merge from master.

Change-Id: I86efabf4d15117b95eaf1f58ce133bdc0ab14510
27 files changed:
include/common/MsgMmsTypes.h
include/mapi/msg_types.h
include/utils/MsgMmsMessage.h
mapi/msg_message.cpp
mapi/msg_mms.cpp
plugin/mms_plugin/CMakeLists.txt
plugin/mms_plugin/MmsPluginCodecCommon.cpp
plugin/mms_plugin/MmsPluginConnManWrapper.cpp
plugin/mms_plugin/MmsPluginDecode.cpp
plugin/mms_plugin/MmsPluginDrm.cpp
plugin/mms_plugin/MmsPluginEventHandler.cpp
plugin/mms_plugin/MmsPluginInternal.cpp
plugin/mms_plugin/MmsPluginMain.cpp
plugin/mms_plugin/MmsPluginMessage.cpp
plugin/mms_plugin/MmsPluginSmil.cpp
plugin/mms_plugin/MmsPluginStorage.cpp
plugin/mms_plugin/MmsPluginUtil.cpp
plugin/mms_plugin/include/MmsPluginCodecTypes.h
plugin/mms_plugin/include/MmsPluginDecode.h
plugin/mms_plugin/include/MmsPluginMain.h
plugin/mms_plugin/include/MmsPluginMessage.h
plugin/mms_plugin/include/MmsPluginSmil.h
plugin/mms_plugin/include/MmsPluginStorage.h
plugin/mms_plugin/include/MmsPluginUtil.h
plugin/sms_plugin/SmsPluginMain.cpp
plugin/sms_plugin/SmsPluginTransport.cpp
utils/MsgMmsMessage.cpp