Merge "Added actor creation from json snippet" into tizen

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

Wed, 3 Sep 2014 12:05:54 +0000 (05:05 -0700)

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

Wed, 3 Sep 2014 12:05:54 +0000 (05:05 -0700)
author Kimmo Hoikka <kimmo.hoikka@samsung.com>
Wed, 3 Sep 2014 12:05:54 +0000 (05:05 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 3 Sep 2014 12:05:54 +0000 (05:05 -0700)
diff --cc base/dali-toolkit/internal/builder/builder-impl.cpp
Simple merge
author	Kimmo Hoikka <kimmo.hoikka@samsung.com>
	Wed, 3 Sep 2014 12:05:54 +0000 (05:05 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Wed, 3 Sep 2014 12:05:54 +0000 (05:05 -0700)