Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master

author Kimmo Hoikka <kimmo.hoikka@samsung.com>

Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)

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

Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)
diff --cc plugins/dali-script-v8/src/constants/constants-wrapper.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Mon, 13 Jul 2015 17:50:28 +0000 (10:50 -0700)