projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-demo.git]
/
com.samsung.dali-demo.xml
diff --git
a/com.samsung.dali-demo.xml
b/com.samsung.dali-demo.xml
index
fa0f9ee
..
40fb016
100644
(file)
--- a/
com.samsung.dali-demo.xml
+++ b/
com.samsung.dali-demo.xml
@@
-61,6
+61,9
@@
<ui-application appid="buttons.example" exec="/usr/apps/com.samsung.dali-demo/bin/buttons.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Buttons</label>
</ui-application>
<ui-application appid="buttons.example" exec="/usr/apps/com.samsung.dali-demo/bin/buttons.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Buttons</label>
</ui-application>
+ <ui-application appid="camera-test.example" exec="/usr/apps/com.samsung.dali-demo/bin/camera-test.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+ <label>Camera Test</label>
+ </ui-application>
<ui-application appid="canvas-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/canvas-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Canvas View</label>
</ui-application>
<ui-application appid="canvas-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/canvas-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Canvas View</label>
</ui-application>
@@
-208,6
+211,9
@@
<ui-application appid="perf-scroll.example" exec="/usr/apps/com.samsung.dali-demo/bin/perf-scroll.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>perf-scroll</label>
</ui-application>
<ui-application appid="perf-scroll.example" exec="/usr/apps/com.samsung.dali-demo/bin/perf-scroll.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>perf-scroll</label>
</ui-application>
+ <ui-application appid="perf-view-creation.example" exec="/usr/apps/com.samsung.dali-demo/bin/perf-view-creation.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+ <label>perf-view-creation</label>
+ </ui-application>
<ui-application appid="pivot.example" exec="/usr/apps/com.samsung.dali-demo/bin/pivot.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Clipping</label>
</ui-application>
<ui-application appid="pivot.example" exec="/usr/apps/com.samsung.dali-demo/bin/pivot.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Clipping</label>
</ui-application>
@@
-268,6
+274,9
@@
<ui-application appid="rendering-triangle.example" exec="/usr/apps/com.samsung.dali-demo/bin/rendering-triangle.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Rendering Triangle</label>
</ui-application>
<ui-application appid="rendering-triangle.example" exec="/usr/apps/com.samsung.dali-demo/bin/rendering-triangle.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Rendering Triangle</label>
</ui-application>
+ <ui-application appid="scene3d-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene3d-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+ <label>Scene3d View</label>
+ </ui-application>
<ui-application appid="scene-loader.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene-loader.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Scene Loader</label>
</ui-application>
<ui-application appid="scene-loader.example" exec="/usr/apps/com.samsung.dali-demo/bin/scene-loader.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
<label>Scene Loader</label>
</ui-application>