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

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

author	David Steele <david.steele@samsung.com>
	Tue, 2 Aug 2016 10:21:53 +0000 (11:21 +0100)
committer	Tom Robinson <tom.robinson@samsung.com>
	Thu, 15 Sep 2016 18:34:40 +0000 (19:34 +0100)
commit	a2d851df4b0fd7cff04d90f6a12576471a8cf18b
tree	49716b2dbc946644a3fc23edc082122a9f6e7068	tree \| snapshot
parent	07f48349d45a852e765218de00cb95d773d703dc	commit \| diff

VR: Merge devel/master into devel/new_vr branch

Change-Id: I453b40b129d97029bd3b95eac8c18024e48f2f08

99 files changed:

.gitignore		diff \| blob \| history
build/tizen/.gitignore		diff \| blob \| history
build/tizen/CMakeLists.txt		diff \| blob \| history
build/tizen/demo/CMakeLists.txt		diff \| blob \| history
build/tizen/examples/CMakeLists.txt		diff \| blob \| history
build/tizen/resources-location.in	[new file with mode: 0644]	blob
com.samsung.dali-demo.xml		diff \| blob \| history
demo/dali-demo.cpp		diff \| blob \| history
demo/dali-table-view.cpp		diff \| blob \| history
demo/dali-table-view.h		diff \| blob \| history
demo/file.list	[deleted file]	blob \| history
demo/po/as.po	[deleted file]	blob \| history
demo/po/de.po	[deleted file]	blob \| history
demo/po/en.po	[deleted file]	blob \| history
demo/po/en_GB.po	[deleted file]	blob \| history
demo/po/en_US.po	[deleted file]	blob \| history
demo/po/es.po	[deleted file]	blob \| history
demo/po/ko.po	[deleted file]	blob \| history
demo/po/ml.po	[deleted file]	blob \| history
demo/po/ur.po	[deleted file]	blob \| history
demo/po/zn_CH.po	[deleted file]	blob \| history
examples/blocks/blocks-example.cpp		diff \| blob \| history
examples/builder/examples.cpp		diff \| blob \| history
examples/homescreen-benchmark/homescreen-benchmark.cpp		diff \| blob \| history
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp		diff \| blob \| history
examples/image-view-pixel-area/image-view-pixel-area-example.cpp		diff \| blob \| history
examples/image-view-svg/image-view-svg-example.cpp		diff \| blob \| history
examples/line-mesh/line-mesh-example.cpp		diff \| blob \| history
examples/mesh-visual/mesh-visual-example.cpp		diff \| blob \| history
examples/model3d-view/model3d-view-example.cpp		diff \| blob \| history
examples/native-image-source/native-image-source-example.cpp		diff \| blob \| history
examples/page-turn-view/page-turn-view-example.cpp		diff \| blob \| history
examples/primitive-shapes/primitive-shapes-example.cpp		diff \| blob \| history
examples/progress-bar/progress-bar-example.cpp	[new file with mode: 0644]	blob
examples/radial-menu/radial-menu-example.cpp	[deleted file]	blob \| history
examples/radial-menu/radial-sweep-view-impl.cpp	[deleted file]	blob \| history
examples/radial-menu/radial-sweep-view-impl.h	[deleted file]	blob \| history
examples/radial-menu/radial-sweep-view.cpp	[deleted file]	blob \| history
examples/radial-menu/radial-sweep-view.h	[deleted file]	blob \| history
examples/renderer-stencil/renderer-stencil-example.cpp		diff \| blob \| history
examples/renderer-stencil/renderer-stencil-shaders.h		diff \| blob \| history
examples/size-negotiation/size-negotiation-example.cpp		diff \| blob \| history
examples/sparkle/sparkle-effect-example.cpp	[new file with mode: 0644]	blob
examples/sparkle/sparkle-effect.h	[new file with mode: 0644]	blob
examples/styling/image-channel-control-impl.cpp	[new file with mode: 0644]	blob
examples/styling/image-channel-control-impl.h	[new file with mode: 0644]	blob
examples/styling/image-channel-control.cpp	[new file with mode: 0644]	blob
examples/styling/image-channel-control.h	[new file with mode: 0644]	blob
examples/styling/style-example.cpp	[new file with mode: 0644]	blob
examples/styling/styling-application.cpp	[new file with mode: 0644]	blob
examples/styling/styling-application.h	[new file with mode: 0644]	blob
examples/text-editor/text-editor-example.cpp		diff \| blob \| history
examples/text-field/text-field-example.cpp		diff \| blob \| history
examples/text-fonts/text-fonts-example.cpp		diff \| blob \| history
examples/text-label/text-label-example.cpp		diff \| blob \| history
examples/tilt/tilt-example.cpp		diff \| blob \| history
packaging/com.samsung.dali-demo.spec		diff \| blob \| history
resources/images/demo-tile-texture.9.png	[new file with mode: 0644]	blob
resources/images/item-background-alpha.9.png	[deleted file]	blob \| history
resources/images/item-background.9.png		diff \| blob \| history
resources/images/light-icon-back.png	[new file with mode: 0644]	blob
resources/images/light-icon-front.png	[moved from resources/images/light-icon.png with 100% similarity]	blob \| history
resources/images/sparkle_normal_background.png	[new file with mode: 0755]	blob
resources/images/sparkle_particle.png	[new file with mode: 0755]	blob
resources/po/as.po	[new file with mode: 0755]	blob
resources/po/de.po	[new file with mode: 0755]	blob
resources/po/en.po	[new symlink]	blob
resources/po/en_GB.po	[new file with mode: 0755]	blob
resources/po/en_US.po	[new file with mode: 0755]	blob
resources/po/es.po	[new file with mode: 0755]	blob
resources/po/ko.po	[new file with mode: 0755]	blob
resources/po/ml.po	[new file with mode: 0755]	blob
resources/po/ur.po	[new file with mode: 0755]	blob
resources/po/zn_CH.po	[new file with mode: 0755]	blob
resources/style/.gitignore	[new file with mode: 0644]	blob
resources/style/demo-theme.json.in		diff \| blob \| history
resources/style/images/.gitignore	[new file with mode: 0644]	blob
resources/style/images/00_popup_bg.9.png	[new file with mode: 0644]	blob
resources/style/images/radio-button-selected.png	[new file with mode: 0644]	blob
resources/style/images/radio-button-unselected-disabled.png	[new file with mode: 0644]	blob
resources/style/images/radio-button-unselected.png	[new file with mode: 0644]	blob
resources/style/images/slider-skin-progress-blue.9.png	[new file with mode: 0644]	blob
resources/style/images/slider-skin-progress-green.9.png	[new file with mode: 0644]	blob
resources/style/images/slider-skin-progress-red.9.png	[new file with mode: 0644]	blob
resources/style/mobile/demo-theme.json.in		diff \| blob \| history
resources/style/mobile/images/radio-button-selected.png	[new file with mode: 0644]	blob
resources/style/mobile/images/radio-button-unselected-disabled.png	[new file with mode: 0644]	blob
resources/style/mobile/images/radio-button-unselected.png	[new file with mode: 0644]	blob
resources/style/mobile/images/slider-skin-progress-blue.9.png	[new file with mode: 0644]	blob
resources/style/mobile/images/slider-skin-progress-green.9.png	[new file with mode: 0644]	blob
resources/style/mobile/images/slider-skin-progress-red.9.png	[new file with mode: 0644]	blob
resources/style/mobile/style-example-theme-one.json.in	[new file with mode: 0644]	blob
resources/style/mobile/style-example-theme-three.json.in	[new file with mode: 0644]	blob
resources/style/mobile/style-example-theme-two.json.in	[new file with mode: 0644]	blob
resources/style/style-example-theme-one.json.in	[new file with mode: 0644]	blob
resources/style/style-example-theme-three.json.in	[new file with mode: 0644]	blob
resources/style/style-example-theme-two.json.in	[new file with mode: 0644]	blob
shared/dali-demo-strings.h		diff \| blob \| history
shared/view.h		diff \| blob \| history

Domain: Graphics System / DALi;

RSS Atom