From: Paul Wisbey <p.wisbey@samsung.com>
Date: Fri, 8 Jan 2016 09:20:05 +0000 (-0800)
Subject: Merge "TextController - Consume the key event." into devel/master
X-Git-Tag: dali_1.1.17~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=bd0b6d9d85d1e484aad8e96b0de89c494f013827;hp=3aea01bf23883b8ceb286c59501d40ac73c3a441

Merge "TextController - Consume the key event." into devel/master
---

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 5c97457..4b0e0a9 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -3,7 +3,7 @@ Summary:    The OpenGLES Canvas Core Library Toolkit
 Version:    1.1.15
 Release:    1
 Group:      System/Libraries
-License:    Apache-2.0, BSD-2.0, MIT
+License:    Apache-2.0 and BSD-2-Clause and MIT
 URL:        https://review.tizen.org/git/?p=platform/core/uifw/dali-toolkit.git;a=summary
 Source0:    %{name}-%{version}.tar.gz