summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-06-03 00:21:33 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-06-03 00:21:33 +0000
commite4dd9661734af4c9ebb37c80549980c6ad439843 (patch)
treeccad6e0ee82bc3766c05f1c313ab540eb8e247cc
parentMerge branch 'master' into local-svn (diff)
parentstring fix: adopting the same description in rekonq, ml, irc, and so on.. (diff)
downloadrekonq-e4dd9661734af4c9ebb37c80549980c6ad439843.tar.xz
Merge branch 'master' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@976912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78c4d740..718b6b89 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ PROJECT( rekonq )
# rekonq info
SET(REKONQ_MAJOR_VERSION "0")
SET(REKONQ_MINOR_VERSION "1")
-SET(REKONQ_PATCH_VERSION "1")
+SET(REKONQ_PATCH_VERSION "2")
SET(REKONQ_VERSION_STR
"${REKONQ_MAJOR_VERSION}.${REKONQ_MINOR_VERSION}.${REKONQ_PATCH_VERSION}"
diff --git a/src/main.cpp b/src/main.cpp
index 009fc4b3..28ad9e8b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,10 +28,10 @@
static const char description[] =
- I18N_NOOP("WebKit-based Web Browser for KDE");
+ I18N_NOOP("WebKit based Web Browser for KDE");
-static const char version[] = "0.1.1";
+static const char version[] = "0.1.2";
int main(int argc, char **argv)