Merge branch 'feature/upstream' into develop

1 files changed, 12 insertions, 12 deletions

diff --git a/configure b/configure
index b56e71f..35254d5 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.28.3.
+# Generated by GNU Autoconf 2.69 for shotwell 0.28.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.28.3'
-PACKAGE_STRING='shotwell 0.28.3'
+PACKAGE_VERSION='0.28.4'
+PACKAGE_STRING='shotwell 0.28.4'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -1505,7 +1505,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.28.3 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.28.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1576,7 +1576,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.28.3:";;
+     short | recursive ) echo "Configuration of shotwell 0.28.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1750,7 +1750,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.28.3
+shotwell configure 0.28.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2028,7 +2028,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.28.3, which was
+It was created by shotwell $as_me 0.28.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2489,12 +2489,12 @@ MAJOR_VERSION=0
 
 MINOR_VERSION=28
 
-MICRO_VERSION=3
+MICRO_VERSION=4
 
 API_VERSION=0
 
 
-GITVER=cacc8bd5415d978f2eb64f215e4be696290c6edc
+GITVER=921ff14cdaf58f804ab1f5a2f9abd15ee5ffa19c
 
 
  if test "x$GITVER" != "x"; then
@@ -2992,7 +2992,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.28.3'
+ VERSION='0.28.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17786,7 +17786,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.28.3, which was
+This file was extended by shotwell $as_me 0.28.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17852,7 +17852,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.28.3
+shotwell config.status 0.28.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"