Merge branch 'feature/upstream' into develop

1 files changed, 12 insertions, 12 deletions

diff --git a/configure b/configure
index bd99142..89983b8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shotwell 0.26.3.
+# Generated by GNU Autoconf 2.69 for shotwell 0.26.4.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shotwell'
 PACKAGE_TARNAME='shotwell'
-PACKAGE_VERSION='0.26.3'
-PACKAGE_STRING='shotwell 0.26.3'
+PACKAGE_VERSION='0.26.4'
+PACKAGE_STRING='shotwell 0.26.4'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -1502,7 +1502,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shotwell 0.26.3 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.26.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1573,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.26.3:";;
+     short | recursive ) echo "Configuration of shotwell 0.26.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1746,7 +1746,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.26.3
+shotwell configure 0.26.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2024,7 +2024,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shotwell $as_me 0.26.3, which was
+It was created by shotwell $as_me 0.26.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2485,12 +2485,12 @@ MAJOR_VERSION=0
 
 MINOR_VERSION=26
 
-MICRO_VERSION=3
+MICRO_VERSION=4
 
 API_VERSION=0
 
 
-GITVER=c2d999c39385c7889b191b2b3b15a6b3d334e579
+GITVER=5bd7d9a736997289de10c3bcdbaa089955e46233
 
 
  if test "x$GITVER" != "x"; then
@@ -2988,7 +2988,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.26.3'
+ VERSION='0.26.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17761,7 +17761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shotwell $as_me 0.26.3, which was
+This file was extended by shotwell $as_me 0.26.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17827,7 +17827,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shotwell config.status 0.26.3
+shotwell config.status 0.26.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"