Merge "Revert "Add scroller in conform.""

author Hermet Park <chuneon.park@samsung.com>

Tue, 29 Mar 2016 00:04:44 +0000 (17:04 -0700)

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

Tue, 29 Mar 2016 00:04:44 +0000 (17:04 -0700)
author Hermet Park <chuneon.park@samsung.com>
Tue, 29 Mar 2016 00:04:44 +0000 (17:04 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 29 Mar 2016 00:04:44 +0000 (17:04 -0700)
diff --cc src/include/efl/ui_base_viewmgr.h
Simple merge
diff --cc src/lib/efl/ui_base_viewmgr.cpp
Simple merge
author	Hermet Park <chuneon.park@samsung.com>
	Tue, 29 Mar 2016 00:04:44 +0000 (17:04 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 29 Mar 2016 00:04:44 +0000 (17:04 -0700)
		1	2
src/include/efl/ui_base_viewmgr.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/efl/ui_base_viewmgr.cpp	patch \|	diff1 \|	diff2 \|	blob \| history