summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS8
-rw-r--r--configure.ac2
2 files changed, 8 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index d35a30305..2d81b09cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
-libgphoto2 2.5.17.1 development
+libgphoto2 2.5.18 release
+
+ptp2:
+* Canon EOS: Fixed file download on several EOS brands, broken by 2.5.17 release.
+
+pentax:
+* Added K01 and K70 models.
------------------------------------------------------------------------------
libgphoto2 2.5.17 release
diff --git a/configure.ac b/configure.ac
index 965fb3136..3864a8545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl NOTE: Be version style _higher_ than the last release.
dnl So lastversion.X.trunk for instance. Bump X if necessary.
dnl ******* THE NEXT RELEASE VERSION MUST BE 2.5.18 at least or higher!
-AC_INIT([libgphoto2 photo camera library], [2.5.17.1], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
+AC_INIT([libgphoto2 photo camera library], [2.5.18], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
AC_CONFIG_SRCDIR([libgphoto2/gphoto2-version.c])
AC_CONFIG_HEADERS([config.h])