[dali_1.0.49] Merge branch 'devel/master' 56/44156/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Jul 2015 08:26:09 +0000 (09:26 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Jul 2015 08:26:09 +0000 (09:26 +0100)
commit9f941d6edb91ff07303f340705a203cf417d7ebf
tree1c0599793653663f4aed95c161245e5e73fe9a94
parent659deaebfb1a6d23b201281a2dcc3eed4daa3d45
parenta5eece9b3ca4aa68a6433438c496460479da8ec1
[dali_1.0.49] Merge branch 'devel/master'

Change-Id: Ic4088b6cc262ea5c7ba02353a0aedde188d14323