projects / platform / core / uifw / dali-demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 51a6704)
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 37/40737/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 8 Jun 2015 09:56:20 +0000 (10:56 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 8 Jun 2015 12:28:04 +0000 (13:28 +0100)
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

Change-Id: I0e3fe040dfe9faaf9074617294d1fde7f0b7ef67


No differences found
Domain: Graphics System / DALi;