Merge "[TV Display] Sync methods implemented" into devel/master

author Jerzy Pabich <j.pabich@samsung.com>

Mon, 29 Dec 2014 13:17:08 +0000 (22:17 +0900)

committer Gerrit Code Review <gerrit@tizensrc>

Mon, 29 Dec 2014 13:17:08 +0000 (22:17 +0900)
author Jerzy Pabich <j.pabich@samsung.com>
Mon, 29 Dec 2014 13:17:08 +0000 (22:17 +0900)
committer Gerrit Code Review <gerrit@tizensrc>
Mon, 29 Dec 2014 13:17:08 +0000 (22:17 +0900)
diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/tizen-wrt.gyp
Simple merge
author	Jerzy Pabich <j.pabich@samsung.com>
	Mon, 29 Dec 2014 13:17:08 +0000 (22:17 +0900)
committer	Gerrit Code Review <gerrit@tizensrc>
	Mon, 29 Dec 2014 13:17:08 +0000 (22:17 +0900)
		1	2
packaging/webapi-plugins.spec	patch \|	diff1 \|	diff2 \|	blob \| history
src/tizen-wrt.gyp	patch \|	diff1 \|	diff2 \|	blob \| history