fix conflict in phpfspot.class.php

[phpfspot.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index ca0bb1a5fe9323609e25f457cd63367b013b5e39..1ff2c36163fac774bba692456563fc61bb170663 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+phpfspot (1.7)
+
+ * feature, F-Spot photo versioning
+
+ -- Andreas Unterkircher <unki@netshadow.at>  Fri, 18 Aug 2008 06:09:00 +0200
+
 phpfspot (1.6)
 
  * bug, sort-by rates if all photos of the library are displayed works now.
@@ -6,8 +12,9 @@ phpfspot (1.6)
    F-Spot does.
  * feature, date-input appears now as one field instead of seperates for year, month
    and day.
+ * feature, make sort-order pre-configurable in phpfspot_cfg.php
 
- -- Andreas Unterkircher <unki@netshadow.at>  Sat, 25 May 2008 11:00:00 +0100
+ -- Andreas Unterkircher <unki@netshadow.at>  Fri, 20 Jun 2008 19:40:00 +0100
 
 phpfspot (1.5)