From 87c9a65eeec161a3edfe25a58a2e45bf9305ef4a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Oct 2009 17:07:22 +0200
Subject: rekonq 0.2.69 - new PreviewImage class (to fix actual bugs) - merging
 last requests - bug fixing

One week to tag rekonq 0.3alpha. Expected master merges are just:
- flickering popup fix
- new contextual menu
- Lionel's new homepage style proposal (to be discussed)

Please NO MORE CHANGES until rekonq 0.3 release, just BUG FIXING..
---
 CMakeLists.txt | 2 +-
 src/main.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46792384..ded215f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ PROJECT( rekonq )
 # rekonq info
 SET(REKONQ_MAJOR_VERSION "0")
 SET(REKONQ_MINOR_VERSION "2")
-SET(REKONQ_PATCH_VERSION "68")
+SET(REKONQ_PATCH_VERSION "69")
 
 SET(REKONQ_VERSION_STR
     "${REKONQ_MAJOR_VERSION}.${REKONQ_MINOR_VERSION}.${REKONQ_PATCH_VERSION}"
diff --git a/src/main.cpp b/src/main.cpp
index e0e8292f..d30ae8e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,7 +38,7 @@ static const char description[] =
     I18N_NOOP("A lightweight Web Browser for KDE based on WebKit");
 
 
-static const char version[] = "0.2.68";
+static const char version[] = "0.2.69";
 
 
 int main(int argc, char **argv)
-- 
cgit v1.2.1