Backported stuff from release and web

diff --git a/ChangeLog b/ChangeLog
index 8a0fe3a..6cba9c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit eff44ead88b83c2b10db7308cda41bb09ddb21c3
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Thu May 26 20:58:35 2016 +0100
+
+    Reformat and reword README
+
+commit aafc9ecdbb6d97a8eeb47e85b7e00324ffc0fd8f
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+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 <tomaszg@math.uwb.edu.pl>
 Date:   Thu May 26 09:23:06 2016 +0100

diff --git a/NEWS b/NEWS
index 0c3fb49..9e11fed 100644 (file)
--- 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 bc15b67..e3efc7d 100644 (file)
--- 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 <Klaus@Ethgen.de>
-        for GPS integration, Search enhancement, Lua integration and other
-        patches
-
-     Colin Clark <cclark@mcb.net>
-        for GPS map integration and more
-
-     Colin Clark <cclark@mcb.net>
-        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 d55fffd..32585f6 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -17,8 +17,8 @@
             <li><a href="//geeqie.org">Main Page</a></li>
             <li>Source Code
                 <ul>
-                    <li><a href="geeqie-1.2.3.tar.xz" rel="nofollow">Tarball</a>,</li>
-                    <li><a href="geeqie-1.2.3.tar.xz.asc" rel="nofollow">GnuPG signature</a></li>
+                    <li><a href="geeqie-1.3.tar.xz" rel="nofollow">Tarball</a>,</li>
+                    <li><a href="geeqie-1.3.tar.xz.asc" rel="nofollow">GnuPG signature</a></li>
                     <li><a href="/cgi-bin/gitweb.cgi?p=geeqie.git" rel="nofollow">Git</a></li>
                 </ul>
             </li>
@@ -76,6 +76,7 @@
         ignore them, and check here instead. Information encountered elsewhere should be considered obsolete.</p>
         <h3>Version History</h3>
         <ul>
+           <li>1.3 - 2016-05-27</li>
             <li>1.2.3 - 2016-04-12</li>
             <li>1.2.2 - 2015-09-10</li>
         </ul>