review.tizen.org Git - platform/framework/web/wrt-plugins-common.git/commit

Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

[Note] Rebase wrt-plugins-common

Conflicts:
CMakeLists.txt
packaging/wrt-plugins-common.spec
src/dispatch-event/dispatch_event_support.cpp
src/dispatch-event/dispatch_event_support.h
src/js-overlay/js_function_manager.cpp
src/plugin-loading/explorer.cpp
src/plugin-loading/plugin_container_support.cpp
src/plugin-loading/plugin_logic.cpp
src/plugins-ipc-message/ipc_message_support.cpp
src/plugins-ipc-message/ipc_message_support.h
src/standards/W3C/Widget/JSPreferences.cpp
src/standards/W3C/Widget/JSWidget.cpp
src/standards/W3C/Widget/plugin_initializer.cpp

Change-Id: I3bdd5d14c3e48bee7431523c93048a31d4244139

author	Soo-Hyun Choi <s.choi@hackerslab.eu>
	Sun, 29 Sep 2013 07:51:25 +0000 (16:51 +0900)
committer	Soo-Hyun Choi <s.choi@hackerslab.eu>
	Sun, 29 Sep 2013 07:51:25 +0000 (16:51 +0900)
commit	d93c2d41a0aa2e0778ee0815ad2f013a6784bd3b
tree	7ce599f5c5a4c689928b422f63085d119f8ce247	tree \| snapshot
parent	35da66fdceaf75e91f76417491a37854f020d433	commit \| diff
parent	9621b19f7791dd3551e7eec322a4389f9203f92d	commit \| diff

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
packaging/wrt-plugins-common.spec	diff1 \|	diff2 \|	blob \| history
pkgconfigs/wrt-plugins-widget-interface.pc.in	diff1 \|	diff2 \|	blob \| history
src/dispatch-event/dispatch_event_support.cpp	diff1 \|	diff2 \|	blob \| history
src/standards/W3C/Widget/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/wrt-popup/wrt/popup-bin/renderer/popup_renderer.cpp	diff1 \|	diff2 \|	blob \| history