Merge branch 'devel/master' into tizen 25/129625/1
authordongsug.song <dongsug.song@samsung.com>
Wed, 17 May 2017 07:45:06 +0000 (16:45 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 17 May 2017 07:45:06 +0000 (16:45 +0900)
commit4721a783a761ff1c4518172f02fa97113034107d
treeca7c888942135643c852275c08ac38d3fb747f91
parentb1bbf704bdd38401b384dc1e30b6a5f7dfad7960
parent80c9052d854ebcf2a8a5628cc84e3cad700efbb7
Merge branch 'devel/master' into tizen

Conflicts:
packaging/dali-csharp-binder.spec

Change-Id: I34926c8a6fe356f659d30d8a0eaa867de597255f
packaging/dali-csharp-binder.spec