From f9e887900ea7115ec2698ea8f5af3ce9e8e6bd75 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 9 Jan 2011 10:31:59 +0000
Subject: [PATCH] Bump to v2.6.0 final

---
 Changelog   | 2 +-
 version.pri | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 8868bafd8..36c526a03 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,4 @@
-* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
+* Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0
     - FEATURE: Use system icons (Linux, Qt >= 4.6)
     - FEATURE: Improved ETA calculation
     - FEATURE: Simplify program preferences
diff --git a/version.pri b/version.pri
index 69a1e66e5..0ddd456fd 100644
--- a/version.pri
+++ b/version.pri
@@ -1,11 +1,11 @@
 os2 {
-    DEFINES += VERSION=\'\"v2.6.0rc3\"\'
+    DEFINES += VERSION=\'\"v2.6.0\"\'
 } else {
-    DEFINES += VERSION=\\\"v2.6.0rc3\\\"
+    DEFINES += VERSION=\\\"v2.6.0\\\"
 }
 DEFINES += VERSION_MAJOR=2
 DEFINES += VERSION_MINOR=6
 DEFINES += VERSION_BUGFIX=0
 
 # NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
-DEFINES += VERSION_TYPE=RELEASE_CANDIDATE
+DEFINES += VERSION_TYPE=NORMAL