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 "Removed GetRenderHasRendered() test from the toolkit autotest" into devel...
[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
3222c87
..
adba36a
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 =
0
;
-const unsigned int TOOLKIT_MICRO_VERSION =
40
;
+const unsigned int TOOLKIT_MINOR_VERSION =
1
;
+const unsigned int TOOLKIT_MICRO_VERSION =
38
;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
@@
-42,7
+42,7
@@
struct PrintVersion
{
PrintVersion()
{
{
PrintVersion()
{
- std::c
out
<< "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << " (" << TOOLKIT_BUILD_DATE << ")" << std::endl;
+ std::c
err
<< "DALi Toolkit: " << TOOLKIT_MAJOR_VERSION << "." << TOOLKIT_MINOR_VERSION << "." << TOOLKIT_MICRO_VERSION << " (" << TOOLKIT_BUILD_DATE << ")" << std::endl;
}
};
PrintVersion TOOLKIT_VERSION;
}
};
PrintVersion TOOLKIT_VERSION;