From 4b953fe8ba3d6b12876817dd282d5e8ee2bfe87d Mon Sep 17 00:00:00 2001
From: Klaus Ethgen
Date: Fri, 27 May 2016 10:46:11 +0100
Subject: [PATCH] Backported stuff from release and web
---
ChangeLog | 16 ++++++++++++++++
NEWS | 22 ++++++++++++++++++++++
README | 10 ----------
web/index.html | 5 +++--
4 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8a0fe3aa..6cba9c57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit eff44ead88b83c2b10db7308cda41bb09ddb21c3
+Author: Klaus Ethgen
+Date: Thu May 26 20:58:35 2016 +0100
+
+ Reformat and reword README
+
+commit aafc9ecdbb6d97a8eeb47e85b7e00324ffc0fd8f
+Author: Klaus Ethgen
+Date: Thu May 26 20:52:20 2016 +0100
+
+ Better Changelog
+
+ - Don't show merges
+ - Don't show notes
+ - Force using UTF-8
+
commit bb44257b22e9249bec08823252ab76ad38adda54
Author: Tomasz Golinski
Date: Thu May 26 09:23:06 2016 +0100
diff --git a/NEWS b/NEWS
index 0c3fb492..9e11fed5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+Geeqie 1.3
+==========
+
+- Sort by creation date
+- Enhancements in mouse less operation
+- Rotation invariant duplication search
+- Better zoom steps
+- Easy access to working directory when copying ('.')
+- Updated documentation
+- Speed improvements
+- Stability improvements
+- Many bugfixes
+
+Geeqie 1.2
+==========
+
+- Support for lcms2
+- Basic support for lua scripting
+- limited map support
+- Initial GTK 3 implementation
+- Several bugfixes
+
Geeqie 1.1
==========
diff --git a/README b/README
index bc15b67b..e3efc7dd 100644
--- a/README
+++ b/README
@@ -552,15 +552,5 @@ Overlay info format string syntax is: %tag[:max_length][:extra]%
Kjell Morgenstern
for random slide show speedup patch
- Klaus Ethgen
- for GPS integration, Search enhancement, Lua integration and other
- patches
-
- Colin Clark
- for GPS map integration and more
-
- Colin Clark
- for GPS map support and more
-
And...
Thanks to the users for finding Geeqie useful.
diff --git a/web/index.html b/web/index.html
index d55fffd4..32585f67 100644
--- a/web/index.html
+++ b/web/index.html
@@ -17,8 +17,8 @@
Main Page
Source Code
@@ -76,6 +76,7 @@
ignore them, and check here instead. Information encountered elsewhere should be considered obsolete.
Version History
+ - 1.3 - 2016-05-27
- 1.2.3 - 2016-04-12
- 1.2.2 - 2015-09-10
--
2.20.1