Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master

1 files changed, 14 insertions, 14 deletions

diff --git a/configure b/configure
index 73a1862f..3e1b1ad0 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 NetworkManager 1.25.91.
+# Generated by GNU Autoconf 2.69 for NetworkManager 1.26.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NetworkManager'
 PACKAGE_TARNAME='NetworkManager'
-PACKAGE_VERSION='1.25.91'
-PACKAGE_STRING='NetworkManager 1.25.91'
+PACKAGE_VERSION='1.26.0'
+PACKAGE_STRING='NetworkManager 1.26.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1726,7 +1726,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 NetworkManager 1.25.91 to adapt to many kinds of systems.
+\`configure' configures NetworkManager 1.26.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1796,7 +1796,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NetworkManager 1.25.91:";;
+     short | recursive ) echo "Configuration of NetworkManager 1.26.0:";;
    esac
   cat <<\_ACEOF
 
@@ -2144,7 +2144,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NetworkManager configure 1.25.91
+NetworkManager configure 1.26.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2917,7 +2917,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 NetworkManager $as_me 1.25.91, which was
+It was created by NetworkManager $as_me 1.26.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3787,7 +3787,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='NetworkManager'
- VERSION='1.25.91'
+ VERSION='1.26.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17970,9 +17970,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 NM_MAJOR_VERSION=1
-NM_MINOR_VERSION=25
-NM_MICRO_VERSION=91
-NM_VERSION=1.25.91
+NM_MINOR_VERSION=26
+NM_MICRO_VERSION=0
+NM_VERSION=1.26.0
 
 
 
@@ -17980,7 +17980,7 @@ NM_VERSION=1.25.91
 
 
 
-NM_GIT_SHA=29019eeb452766b999d441adf0df95e7869838af
+NM_GIT_SHA=8582a5f356b758b9fc44f977fbad10132fcbd926
 
 if test """" != "no-config-h" ; then
 
@@ -29167,7 +29167,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 NetworkManager $as_me 1.25.91, which was
+This file was extended by NetworkManager $as_me 1.26.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29233,7 +29233,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="\\
-NetworkManager config.status 1.25.91
+NetworkManager config.status 1.26.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"