Merge branch 'tizen_2.4' into tizen_3.0
authorRafal Galka <r.galka@samsung.com>
Mon, 3 Aug 2015 09:22:59 +0000 (11:22 +0200)
committerRafal Galka <r.galka@samsung.com>
Mon, 3 Aug 2015 09:22:59 +0000 (11:22 +0200)
Change-Id: I7b534898ec592be5774c19fd1bd3b93867f2348e
Signed-off-by: Rafal Galka <r.galka@samsung.com>
1  2 
packaging/webapi-plugins.spec
src/messaging/message_conversation.h

Simple merge
Simple merge