summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2014-03-23 18:05:31 +0000
committerMarcus Meissner <marcus@jet.franken.de>2014-03-23 18:05:31 +0000
commit7bd9512f222738970e052a979e00d1f3c3ae44be (patch)
tree982913855758384d95bd3ba7a0ce53085da01008
parent8339628dfd78f7d7e20f0fdd771c6a3c01ac43f9 (diff)
downloadlibgphoto2-7bd9512f222738970e052a979e00d1f3c3ae44be.tar.gz
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14853 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--NEWS8
-rw-r--r--configure.ac4
2 files changed, 6 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 786ac444c..226ecdfba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,4 @@
-libgphoto2 2.5.3.2 release
-
-all:
-* Lots of small fixes to build with mingw32.
+libgphoto2 2.5.4 release
ptp2:
* Sony SLT DSLR support: SDRAM capture, Tethering, Triggering movie capture, property reading
@@ -31,6 +28,9 @@ sierra:
libusb1:
* fixed timeout detection for USB interrupts
+all:
+* Lots of small fixes to build with mingw32.
+
Translations updates:
* Danish, Spanish, French, Dutch, Polish, Russian, Serbian, Ukrainian,
Vietnamese
diff --git a/configure.ac b/configure.ac
index bb3ebc41e..3c952fb07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ AC_PREREQ(2.59)
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.4 at least or higher!
-AC_INIT([libgphoto2 photo camera library], [2.5.3.2], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
+dnl ******* THE NEXT RELEASE VERSION MUST BE 2.5.5 at least or higher!
+AC_INIT([libgphoto2 photo camera library], [2.5.4], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
AC_CONFIG_SRCDIR([libgphoto2/gphoto2-version.c])
AC_CONFIG_HEADERS([config.h])