review.tizen.org Git - platform/core/uifw/dali-toolkit.git/commit

Merge branch 'devel/master' into devel/new_mesh

Conflicts:
automated-tests/src/dali-toolkit/CMakeLists.txt
dali-toolkit/devel-api/shader-effects/distance-field-effect.cpp
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
dali-toolkit/internal/atlas-manager/atlas-manager.cpp
dali-toolkit/internal/atlas-manager/atlas-manager.h
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.h
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/text/decorator/text-decorator.cpp
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
dali-toolkit/public-api/controls/control-impl.cpp

Change-Id: I48b90c6c4696dbc7b65659ecf6004a09a17c7ab0

author	Francisco Santos <f1.santos@samsung.com>
	Thu, 25 Jun 2015 14:23:06 +0000 (15:23 +0100)
committer	Francisco Santos <f1.santos@samsung.com>
	Fri, 26 Jun 2015 12:55:46 +0000 (13:55 +0100)
commit	31df2b9472ccbe0ae460a958535be8ef790c96f2
tree	863047b1826d6778985c67bed8cb0cb14fa2ecea	tree \| snapshot
parent	c6032a09ae68156bcdaef2f09fbb4617245bc75f	commit \| diff
parent	653e65df6f984c2c11fda4b961f1015d3da1aea0	commit \| diff

automated-tests/src/dali-toolkit/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp	diff1 \|	diff2 \|	blob \| history
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp	diff1 \|	diff2 \|	blob \| history
build/tizen/configure.ac	diff1 \|	diff2 \|	blob \| history
build/tizen/dali-toolkit/Makefile.am	diff1 \|	diff2 \|	blob \| history
dali-toolkit/devel-api/file.list	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/atlas-manager/atlas-manager.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/builder/builder-animations.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/builder/builder-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/slider/slider-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-field-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-label-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/file.list	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/decorator/text-decorator.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/control-impl.cpp	diff1 \|	diff2 \|	blob \| history
dali-toolkit/public-api/controls/control-impl.h	diff1 \|	diff2 \|	blob \| history