projects / platform / core / uifw / dali-demo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2014517 c4e1aa0)
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 04/39604/1
authorFrancisco Santos <f1.santos@samsung.com>
Tue, 19 May 2015 10:55:33 +0000 (11:55 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Tue, 19 May 2015 10:55:33 +0000 (11:55 +0100)
commit661d97a34184795b6a99266a4a8b744f5fc11aa8
tree7fb74da80d515b5a0e8cd071630590b5b2735f07tree | snapshot
parent2014517721a4f213e607a44322503441d5c34244commit | diff
parentc4e1aa0be6cd88c2f7676c8c491f97a2bf182220commit | diff
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-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.h
examples/radial-menu/radial-sweep-view.cpp
examples/refraction-effect/refraction-effect-example.cpp

Change-Id: I9da2bc5f3145cd179535081fca2d2504f4fd6cd6
examples/cluster/cluster-example.cpp diff1 | diff2 | blob | history
Domain: Graphics System / DALi;