Commit ba0306cf authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

Version bump to 0.26.0 (stable release)

parent 4e087c81
......@@ -132,7 +132,7 @@ ControlView::~ControlView()
QString ControlView::applicationVersion()
{
return "2.0.20 (2.1 development version)";
return "2.1.0 (stable release)";
}
MapThemeManager *ControlView::mapThemeManager()
......
......@@ -38,8 +38,8 @@ INCLUDE(layers/CMakeLists.txt)
INCLUDE(osm/CMakeLists.txt)
set(MARBLE_LIB_VERSION_MAJOR "0")
set(MARBLE_LIB_VERSION_MINOR "25")
set(MARBLE_LIB_VERSION_PATCH "20")
set(MARBLE_LIB_VERSION_MINOR "26")
set(MARBLE_LIB_VERSION_PATCH "0")
set(MARBLE_LIB_VERSION "${MARBLE_LIB_VERSION_MAJOR}.${MARBLE_LIB_VERSION_MINOR}.${MARBLE_LIB_VERSION_PATCH}")
set(MARBLE_ABI_VERSION "26")
......
......@@ -247,14 +247,14 @@ const qreal SEC2HOUR = 1.0 / HOUR2SEC;
// String for about dialog and http user agent
// FIXME: check if blanks are allowed in user agent version numbers
const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.25.20 (0.26 development version)" );
const QString MARBLE_VERSION_STRING = QString::fromLatin1( "0.26.0 (stable release)" );
// API Version id:
// form : 0xMMmmpp
// MM = major revision.
// mm = minor revision.
// pp = patch revision.
#define MARBLE_VERSION 0x001914
#define MARBLE_VERSION 0x001a00
static const char NOT_AVAILABLE[] = QT_TRANSLATE_NOOP("Marble", "not available");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment