Merge branch 'tizen_3.0' into tizen 97/120097/1 accepted/tizen/common/20170321.140644 accepted/tizen/ivi/20170322.235342 accepted/tizen/mobile/20170322.235251 accepted/tizen/tv/20170322.235307 accepted/tizen/unified/20170322.235358 accepted/tizen/wearable/20170322.235333 submit/tizen/20170321.103453
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 21 Mar 2017 10:30:08 +0000 (19:30 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Tue, 21 Mar 2017 10:30:08 +0000 (19:30 +0900)
Change-Id: Ibb61b772fe0b52fe72af0fc5ec48a55fc0a48a8c

1  2 
configure.ac
ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
packaging/isf.spec

diff --cc configure.ac
Simple merge
Simple merge