From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Fri, 22 Jan 2016 18:16:47 +0000 (-0800)
Subject: Merge "JavaScript binding for ScrollView" into devel/master
X-Git-Tag: dali_1.1.19~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c39cebb2a9fdaaad0492de1665bad112d3176f6;hp=e47d25c5332ac9ac9e3e90041a4b9012667255ad;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge "JavaScript binding for ScrollView" into devel/master
---

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 9f79c9c..afebe0a 100644
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 17;
+const unsigned int TOOLKIT_MICRO_VERSION = 18;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index c8057f7..d326e26 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.1.17
+Version:    1.1.18
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT