projects / platform / core / uifw / dali-demo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d808b6c beef902)
Merge branch 'tizen' into devel/new_mesh 84/38784/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 27 Apr 2015 13:22:15 +0000 (14:22 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 28 Apr 2015 10:40:30 +0000 (11:40 +0100)
commit14d695efd0c2ceef45ef1111119437edeafe3084
treea3267a284ae76bf5bf09af36e7a53da047aaa728tree | snapshot
parentd808b6c519ac83f2a3d668dcb2c7b7bdcfc01b86commit | diff
parentbeef90266478b6286bef529f3d3a54d4fdbee05bcommit | diff
Merge branch 'tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp
examples/radial-menu/radial-menu-example.cpp
examples/radial-menu/radial-sweep-view-impl.cpp
examples/refraction-effect/refraction-effect-example.cpp

Change-Id: I6bb0c29e38e270ce7fc212cbc78845a40881c9a4
examples/line-mesh/line-mesh-example.cpp diff1 | | blob | history
examples/point-mesh/point-mesh-example.cpp diff1 | | blob | history
examples/textured-mesh/textured-mesh-example.cpp diff1 | | blob | history
Domain: Graphics System / DALi;