Merge "(Image) Remove API that allows various load/release policies with a NativeImag...

author Adeel Kazmi <adeel.kazmi@samsung.com>

Tue, 23 Sep 2014 10:49:46 +0000 (03:49 -0700)

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

Tue, 23 Sep 2014 10:49:46 +0000 (03:49 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Tue, 23 Sep 2014 10:49:46 +0000 (03:49 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 23 Sep 2014 10:49:46 +0000 (03:49 -0700)
diff --cc dali/internal/event/images/image-impl.cpp
Simple merge
diff --cc dali/internal/event/images/image-impl.h
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Tue, 23 Sep 2014 10:49:46 +0000 (03:49 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Tue, 23 Sep 2014 10:49:46 +0000 (03:49 -0700)
		1	2
dali/internal/event/images/image-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali/internal/event/images/image-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history