projects / platform / core / messaging / msg-service.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc48aae ad51880)
Merge branch 'master' into tizen_2.1
authorSangkoo Kim <sangkoo.kim@samsung.com>
Fri, 15 Mar 2013 08:13:57 +0000 (17:13 +0900)
committerSangkoo Kim <sangkoo.kim@samsung.com>
Fri, 15 Mar 2013 08:20:21 +0000 (17:20 +0900)
commitce3b206f66a619a00020d085c11541243b65f0aa
tree27f3d903c216276ae4ecc635561e3069d9c9f60btree | snapshot
parentfc48aae478c97cbfc46c4d0adee67f392723319fcommit | diff
parentad518802ca13b8272af2c36682609321ed4b134ecommit | diff
Merge branch 'master' into tizen_2.1

Conflicts:
include/common/MsgInternalTypes.h
mapi/msg_message.cpp
mapi/msg_mms.cpp
mapi/msg_transport.cpp
msg-service.manifest
packaging/msg-service.spec
plugin/sms_plugin/SmsPluginTransport.cpp
proxy/MsgHandleControl.cpp
utils/MsgMmsMessage.cpp
utils/MsgUtilStorage.cpp

Change-Id: Id47318cb4c35e60aa950e1e0c02e38f6e10d7034
mapi/msg_message.cpp diff1 | diff2 | blob | history
mapi/msg_mms.cpp diff1 | diff2 | blob | history
proxy/MsgHandleControl.cpp diff1 | diff2 | blob | history
Domain: Service Framework / Messaging;