Merge branch 'tizen_dev' into tizen 03/94803/1 submit/tizen/20161101.085508
authorAndrey Klimenko <and.klimenko@samsung.com>
Tue, 1 Nov 2016 08:40:34 +0000 (10:40 +0200)
committerAndrey Klimenko <and.klimenko@samsung.com>
Tue, 1 Nov 2016 08:40:41 +0000 (10:40 +0200)
commit557997dc57558abb087c7f957c5fe5e961d41636
treea75e94c2fceab4d5d8c28bf0a635ef8b3372090e
parentfe4682b41f55cf14e8d8089be05ac409234e8190
parent9b64f2f13a0e5bcf48cd628454df8ee480dd1f3d
Merge branch 'tizen_dev' into tizen

Change-Id: I2647c8d75d4f5d8f45b561bc3caa5e0407df7bf3
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>
src/Conversation/AppControl/inc/AttachPanel.h
src/Conversation/AppControl/src/AttachPanel.cpp
src/Conversation/Main/Controller/src/Conversation.cpp