Merge branch 'master' of git://github.com/derf/feh

1 files changed, 40 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 10d855c..9645aaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+git HEAD
+
+    * Do not apply --scale-down to the thumbnail window. It will be applied
+      to windows opened from this, though.
+    * Patch by Rob Cornish: Respect --image-bg when setting a wallpaper
+
+Tue, 16 Oct 2012 06:29:58 +0200  Daniel Friesel <derf+feh@finalrewind.org>
+
+* Release v2.7
+    * Add --min-dim and --max-dim options to only process images with certain
+      dimensions
+
+Thu, 27 Sep 2012 16:48:48 +0200  Daniel Friesel <derf+feh@finalrewind.org>
+
+* Release v2.6.3
+    * Fix segfault when doing lossless mirror/rotate and jpegexiforient is
+      not present <https://github.com/derf/feh/issues/100>
+
+Wed, 26 Sep 2012 17:06:50 +0200  Daniel Friesel <derf+feh@finalrewind.org>
+
+* Release v2.6.2
+    * Set EXIF orientation tag to 1 ("0,0 is top left" aka normal) after
+      running jpegtran. Previously, when doing a lossless rotate, the image
+      was rotated but the corresponding EXIF tag not updated, resulting in
+      wrong image display in programs aware of this EXIF tag.
+    * Fix spelling in feh(1)
+    * Compile debug builds with -O0
+
+Thu, 13 Sep 2012 12:00:06 +0200  Daniel Friesel <derf+feh@finalrewind.org>
+
+* Release v2.6.1
+    * Fix freedesktop.org Thumbnail Managing Standard implementation:
+      when running feh on the current working directory, '/path/to/./image.png'
+      was used for thumbnail name generation. Now it is always
+      '/path/to/image.png'
+    * Show error message if lossless rotate / flip failed on non-JPEG image
+    * Show error message if -O / -o failed to save image
+    * Show error message if load failed and magick is disabled (was broken
+      by feh 2.4)
+
 Tue, 28 Aug 2012 11:46:19 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
 * Release v2.6