projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi Version 1.2.18" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
dali-toolkit-version.cpp
diff --git
a/dali-toolkit/public-api/dali-toolkit-version.cpp
b/dali-toolkit/public-api/dali-toolkit-version.cpp
index
0f27e3b
..
2a95e7b
100644
(file)
--- a/
dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/
dali-toolkit/public-api/dali-toolkit-version.cpp
@@
-30,8
+30,8
@@
namespace Toolkit
{
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
{
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
-const unsigned int TOOLKIT_MINOR_VERSION =
1
;
-const unsigned int TOOLKIT_MICRO_VERSION =
43
;
+const unsigned int TOOLKIT_MINOR_VERSION =
2
;
+const unsigned int TOOLKIT_MICRO_VERSION =
18
;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED