From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Tue, 10 Jun 2014 15:34:19 +0000 (+0100)
Subject: Merge branch 'master' into tizen
X-Git-Tag: dali_1.0.0~46
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c07e3ed89c64a853b2c4a6865c757764761413b1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'master' into tizen
---

c07e3ed89c64a853b2c4a6865c757764761413b1
diff --cc packaging/dali-adaptor.spec
index 59fc60e84,e7e387fb2..03339366c
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -1,9 -1,9 +1,9 @@@
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    0.9.15
+ Version:    0.9.18
  Release:    1
  Group:      System/Libraries
 -License:    Flora
 +License:    Apache 2.0
  URL:        https://review.tizen.org/git/?p=platform/core/uifw/dali-adaptor.git;a=summary
  Source0:    %{name}-%{version}.tar.gz