Merge branch 'devel/new_mesh' into devel/master 86/42386/2
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:24:45 +0000 (15:24 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 16:00:45 +0000 (17:00 +0100)
commitd3a00dc1c24ece2488696c0b518013ad6d97969b
tree03e18d76ca4caad9e19e2d651b560996eccb85f7
parent1263805136b9938e348fd4e519e64fa9bad20f94
parentd9c164e4530e354cd14dc4a1a658070ba55e99b8
Merge branch 'devel/new_mesh' into devel/master

Change-Id: I41d2ce44857efc23c3a830ede52849b4d415b6f6
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp