projects / platform / core / uifw / dali-csharp-binder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 989a599 5340e47)
Merge branch 'devel/master' into tizen 50/137350/1
authordongsug.song <dongsug.song@samsung.com>
Wed, 5 Jul 2017 09:07:52 +0000 (18:07 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 5 Jul 2017 09:08:17 +0000 (18:08 +0900)
Change-Id: I96f06f5c1e619d1dce21f8dc55bbd8dafaf798f6

1  2 
dali-csharp-binder/src/dali_wrap.cpp patch | diff1 | diff2 | blob | history
packaging/dali-csharp-binder.spec patch | diff1 | diff2 | blob | history

diff --cc dali-csharp-binder/src/dali_wrap.cpp
Simple merge
diff --cc packaging/dali-csharp-binder.spec
index 85cf9e4,47b2ac2..1005c27
--- 1/packaging/dali-csharp-binder.spec
--- 2/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@@ -1,5 -1,6 +1,6 @@@
+ 
  Name: dali-csharp-binder
 -Version: 1.2.39
 +Version: 1.2.41
  Release: 1
  Summary: build dali csharp binder
  License: Apache-2.0 and BSD-3-Clause and MIT
Domain: Graphics System / DALi; Licenses: Apache-2.0;