sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oop left a merge half-merged

Browse Source
This commit is contained in:
John Cupitt 2017-04-23 19:22:23 +01:00
parent 4c8d83ce85
commit 45f94fefeb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2,11 +2,7 @@
# also update the version number in the m4 macros below # also update the version number in the m4 macros below
<<<<<<< HEAD
AC_INIT([vips], [8.6.0], [vipsip@jiscmail.ac.uk]) AC_INIT([vips], [8.6.0], [vipsip@jiscmail.ac.uk])
=======
AC_INIT([vips], [8.5.5], [vipsip@jiscmail.ac.uk])
>>>>>>> 8.5
# required for gobject-introspection # required for gobject-introspection
AC_PREREQ(2.62) AC_PREREQ(2.62)