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

projects / platform / core / uifw / dali-demo.git / commit

author	Paul Wisbey <p.wisbey@samsung.com>
	Wed, 4 Mar 2015 18:53:01 +0000 (18:53 +0000)
committer	Paul Wisbey <p.wisbey@samsung.com>
	Wed, 4 Mar 2015 19:21:03 +0000 (19:21 +0000)
commit	8a61f04a9bf4241761bda7742918967f34de2891
tree	b3a4a85b608f86e31a87d6377412dbe53e0142fd	tree \| snapshot
parent	ffd1f760ae0bc1b85f862cfab389305278774afb	commit \| diff
parent	b074eb7536d4774fa7bc13277c5b0edfea52fefd	commit \| diff

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
build/tizen/examples/CMakeLists.txt
demo/dali-demo.cpp
examples/buttons/buttons-example.cpp
examples/item-view/item-view-example.cpp
examples/text-view/text-view-example.cpp

Change-Id: I8816d065edca8e2a3fd37cdcedda4b02735f5007

36 files changed:

build/tizen/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
com.samsung.dali-demo.xml	diff1 \|	diff2 \|	blob \| history
demo/dali-demo.cpp	diff1 \|	diff2 \|	blob \| history
demo/dali-table-view.cpp	diff1 \|	diff2 \|	blob \| history
examples/builder/examples.cpp	diff1 \|	diff2 \|	blob \| history
examples/buttons/buttons-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/cluster/cluster-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/cube-transition-effect/cube-transition-effect-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/dissolve-effect/dissolve-effect-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/item-view/item-view-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/logging/logging-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/motion-blur/motion-blur-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/motion-stretch/motion-stretch-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/new-window/new-window-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/path-animation/path-animation.cpp	\|	diff2 \|	blob \| history
examples/scroll-view/scroll-view-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/text-field/edit-layout-impl.cpp	diff1 \|	\|	blob \| history
examples/text-field/edit-layout-impl.h	diff1 \|	\|	blob \| history
examples/text-field/edit-layout.cpp	diff1 \|	\|	blob \| history
examples/text-field/edit-layout.h	diff1 \|	\|	blob \| history
examples/text-field/text-field-example.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/text-label-multi-language-example.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout-impl.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout-impl.h	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout.h	diff1 \|	\|	blob \| history
examples/text-label/center-layout-impl.cpp	diff1 \|	\|	blob \| history
examples/text-label/center-layout-impl.h	diff1 \|	\|	blob \| history
examples/text-label/center-layout.cpp	diff1 \|	\|	blob \| history
examples/text-label/center-layout.h	diff1 \|	\|	blob \| history
examples/text-label/text-label-example.cpp	diff1 \|	\|	blob \| history
packaging/com.samsung.dali-demo.spec	diff1 \|	diff2 \|	blob \| history
shared/dali-demo-strings.h	diff1 \|	\|	blob \| history
shared/view.h	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / DALi;

RSS Atom

build/tizen/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
com.samsung.dali-demo.xml	diff1 \|	diff2 \|	blob \| history
demo/dali-demo.cpp	diff1 \|	diff2 \|	blob \| history
demo/dali-table-view.cpp	diff1 \|	diff2 \|	blob \| history
examples/builder/examples.cpp	diff1 \|	diff2 \|	blob \| history
examples/buttons/buttons-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/cluster/cluster-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/cube-transition-effect/cube-transition-effect-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/dissolve-effect/dissolve-effect-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/item-view/item-view-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/logging/logging-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/motion-blur/motion-blur-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/motion-stretch/motion-stretch-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/new-window/new-window-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/path-animation/path-animation.cpp	\|	diff2 \|	blob \| history
examples/scroll-view/scroll-view-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp	diff1 \|	diff2 \|	blob \| history
examples/text-field/edit-layout-impl.cpp	diff1 \|	\|	blob \| history
examples/text-field/edit-layout-impl.h	diff1 \|	\|	blob \| history
examples/text-field/edit-layout.cpp	diff1 \|	\|	blob \| history
examples/text-field/edit-layout.h	diff1 \|	\|	blob \| history
examples/text-field/text-field-example.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/text-label-multi-language-example.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout-impl.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout-impl.h	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout.cpp	diff1 \|	\|	blob \| history
examples/text-label-multi-language/vertical-layout.h	diff1 \|	\|	blob \| history
examples/text-label/center-layout-impl.cpp	diff1 \|	\|	blob \| history
examples/text-label/center-layout-impl.h	diff1 \|	\|	blob \| history
examples/text-label/center-layout.cpp	diff1 \|	\|	blob \| history
examples/text-label/center-layout.h	diff1 \|	\|	blob \| history
examples/text-label/text-label-example.cpp	diff1 \|	\|	blob \| history
packaging/com.samsung.dali-demo.spec	diff1 \|	diff2 \|	blob \| history
shared/dali-demo-strings.h	diff1 \|	\|	blob \| history
shared/view.h	diff1 \|	diff2 \|	blob \| history