Merge "Add video view control" into devel/master

author taeyoon <taeyoon0.lee@samsung.com>

Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)
author taeyoon <taeyoon0.lee@samsung.com>
Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)
diff --cc build/tizen/dali-toolkit/Makefile.am
Simple merge
diff --cc dali-toolkit/dali-toolkit.h
Simple merge
diff --cc dali-toolkit/public-api/file.list
Simple merge
author	taeyoon <taeyoon0.lee@samsung.com>
	Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)
		1	2
build/tizen/dali-toolkit/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/dali-toolkit.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/file.list	patch \|	diff1 \|	diff2 \|	blob \| history