From 9634e437efeeda906ad6bfcc275b17732d64f32a Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Wed, 1 Oct 2014 09:59:00 -0700
Subject: [PATCH] Version Bump -- 2.6.0

---
 CHANGES.rst     | 8 +++++++-
 PIL/__init__.py | 2 +-
 _imaging.c      | 2 +-
 setup.py        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f7a0a7f84..52419088f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,9 +1,15 @@
 Changelog (Pillow)
 ==================
 
-2.6.0-rc1 (2014-09-29)
+2.6.0 (2014-10-01)
 ------------------
 
+- Relax precision of ImageDraw tests for x86, GimpGradient for PPC
+  [wiredfool]
+
+2.6.0-rc1 (2014-09-29)
+----------------------
+
 - Use redistributable image for testing #884
   [hugovk]
 
diff --git a/PIL/__init__.py b/PIL/__init__.py
index 30e845182..1bb1250c8 100644
--- a/PIL/__init__.py
+++ b/PIL/__init__.py
@@ -12,7 +12,7 @@
 # ;-)
 
 VERSION = '1.1.7'  # PIL version
-PILLOW_VERSION = '2.6.0-rc1'  # Pillow
+PILLOW_VERSION = '2.6.0'  # Pillow
 
 _plugins = ['BmpImagePlugin',
             'BufrStubImagePlugin',
diff --git a/_imaging.c b/_imaging.c
index 2b5825dd8..1759d4c8d 100644
--- a/_imaging.c
+++ b/_imaging.c
@@ -71,7 +71,7 @@
  * See the README file for information on usage and redistribution.
  */
 
-#define PILLOW_VERSION "2.6.0-rc1"
+#define PILLOW_VERSION "2.6.0"
 
 #include "Python.h"
 
diff --git a/setup.py b/setup.py
index 4bce62e36..2d8cafa34 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ except (ImportError, OSError):
 
 
 NAME = 'Pillow'
-PILLOW_VERSION = '2.6.0-rc1'
+PILLOW_VERSION = '2.6.0'
 TCL_ROOT = None
 JPEG_ROOT = None
 JPEG2K_ROOT = None