projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into sandbox/dkdk/tizen
[platform/core/uifw/dali-adaptor.git]
/
dali
/
public-api
/
dali-adaptor-version.cpp
diff --git
a/dali/public-api/dali-adaptor-version.cpp
b/dali/public-api/dali-adaptor-version.cpp
index
b6b68d6
..
72c7144
100644
(file)
--- a/
dali/public-api/dali-adaptor-version.cpp
+++ b/
dali/public-api/dali-adaptor-version.cpp
@@
-25,11
+25,10
@@
namespace Dali
{
namespace Dali
{
-
const unsigned int ADAPTOR_MAJOR_VERSION = 1;
const unsigned int ADAPTOR_MINOR_VERSION = 9;
const unsigned int ADAPTOR_MAJOR_VERSION = 1;
const unsigned int ADAPTOR_MINOR_VERSION = 9;
-const unsigned int ADAPTOR_MICRO_VERSION =
12
;
-const char
* const
ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__;
+const unsigned int ADAPTOR_MICRO_VERSION =
29
;
+const char
* const
ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
namespace
#ifdef DEBUG_ENABLED
namespace