Merge "Rename BitmapImage as BufferImage" into tizen
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 25 Feb 2015 16:51:05 +0000 (08:51 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 25 Feb 2015 16:51:06 +0000 (08:51 -0800)
1  2 
automated-tests/src/dali/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h
automated-tests/src/dali/utc-Dali-RenderTask.cpp
dali/public-api/dali-core.h
dali/public-api/file.list

Simple merge
Simple merge