From 8a86ecee389341ecafeaf7075eb8565cba305a67 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 6 Jun 2012 15:02:19 -0400
Subject: [PATCH] pe v2.6.0

---
 core_pe/__init__.py | 2 +-
 help/changelog_pe   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core_pe/__init__.py b/core_pe/__init__.py
index 992681d4..4eef89ce 100644
--- a/core_pe/__init__.py
+++ b/core_pe/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '2.5.0'
+__version__ = '2.6.0'
 __appname__ = 'dupeGuru Picture Edition'
\ No newline at end of file
diff --git a/help/changelog_pe b/help/changelog_pe
index db408622..b008b70b 100644
--- a/help/changelog_pe
+++ b/help/changelog_pe
@@ -1,3 +1,11 @@
+=== 2.6.0 (2012-06-06)
+
+* Added Aperture support. (#42)
+* Added a Deletion Options panel.
+* Greatly improved memory usage for big scans.
+* Added a keybinding for the filter field. (#182) [Mac]
+* Upgraded minimum requirements for Ubuntu to 12.04.
+
 === 2.5.0 (2012-03-31)
 
 * Improved results window UI. [Windows, Linux]