[Release] livebox.web-provider-1.56 submit/tizen_2.2/20130927.092158 submit/tizen_2.2/20130927.102242
authorsung-su.kim <sung-su.kim@samsung.com>
Fri, 27 Sep 2013 00:53:36 +0000 (09:53 +0900)
committersung-su.kim <sung-su.kim@samsung.com>
Fri, 27 Sep 2013 00:53:36 +0000 (09:53 +0900)
commitafe2ce5908a572b708e37f1568ad5861e5a0fe1d
tree2c815fa60a8273381d0e544ddb9110fe28b459dd
parent5e000270697fe85ed6deecd97ddd1dd3943031cc
parent0bea9b692f650667a1efab7b565fdb64ef899bb3
[Release] livebox.web-provider-1.56

Merge branch 'master' into tizen_2.2

Conflicts:
packaging/livebox.web-provider.spec
src/API/web_provider_livebox_info.cpp
src/API/web_provider_livebox_info.h
src/Core/Box.cpp
src/Core/Box.h
src/Core/BoxData.h
src/Core/BoxManager.cpp
src/Core/BoxManager.h
src/Core/BoxSchemeHandler.cpp
src/Core/Buffer/RenderBuffer.cpp
src/Core/IBox.h
src/Core/Service/MessageManager.cpp
src/Core/Service/PeriodChanger.cpp
src/Core/View/PdHelper.cpp
src/Core/View/WebView.cpp
src/Daemon/BoxDaemonImpl.cpp
src/Daemon/BoxDaemonImpl.h
src/Daemon/main.cpp
src/Plugin/AppBoxPlugin/AppBoxRenderBuffer.cpp
src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
src/Plugin/box_plugin_interface.h

Change-Id: Ic91c4903ab69ae7a05612c73a57017e328f46da5