Merge branch 'devel/master' into tizen 97/140397/1
authordongsug.song <dongsug.song@samsung.com>
Tue, 25 Jul 2017 00:27:52 +0000 (09:27 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 25 Jul 2017 00:28:14 +0000 (09:28 +0900)
Change-Id: I2ac26198b11ad8a847b4e29f74f29fc78a1dc71a

1  2 
dali-csharp-binder/src/dali_wrap.cpp

Simple merge