Merge remote branch 'upstream/master'

Conflicts:
	src/exif.c

1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c29a1d9..eda2b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+git HEAD
+
+    * exif-support fixes by Dennis Real
+    * format specifier %S now uses the appropriate suffix (B/kB/MB)
+    * format specifier %P now prints the number of pixels with k/M suffix,
+      like %S. Printing the program name ("feh") is no longer supported
+    * feh --list now uses %S/%P to print image size and amount of pixels
+
 Thu, 02 Feb 2012 21:04:06 +0100  Daniel Friesel <derf@finalrewind.org>
 
 * Release v2.3