Merge branch 'master' into squeeze-backportssqueeze-backports

Conflicts:
	debian/changelog

1 files changed, 10 insertions, 10 deletions

diff --git a/configure b/configure
index d24b418..3f88727 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.68 for Phidget21 C Library 2.1.8.20120912.
+# Generated by GNU Autoconf 2.68 for Phidget21 C Library 2.1.8.20121218.
 #
 # Report bugs to <support@phidgets.com>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Phidget21 C Library'
 PACKAGE_TARNAME='libphidget'
-PACKAGE_VERSION='2.1.8.20120912'
-PACKAGE_STRING='Phidget21 C Library 2.1.8.20120912'
+PACKAGE_VERSION='2.1.8.20121218'
+PACKAGE_STRING='Phidget21 C Library 2.1.8.20121218'
 PACKAGE_BUGREPORT='support@phidgets.com'
 PACKAGE_URL='www.phidgets.com'
 
@@ -1322,7 +1322,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 Phidget21 C Library 2.1.8.20120912 to adapt to many kinds of systems.
+\`configure' configures Phidget21 C Library 2.1.8.20121218 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1392,7 +1392,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Phidget21 C Library 2.1.8.20120912:";;
+     short | recursive ) echo "Configuration of Phidget21 C Library 2.1.8.20121218:";;
    esac
   cat <<\_ACEOF
 
@@ -1504,7 +1504,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Phidget21 C Library configure 2.1.8.20120912
+Phidget21 C Library configure 2.1.8.20121218
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1782,7 +1782,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 Phidget21 C Library $as_me 2.1.8.20120912, which was
+It was created by Phidget21 C Library $as_me 2.1.8.20121218, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2597,7 +2597,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libphidget'
- VERSION='2.1.8.20120912'
+ VERSION='2.1.8.20121218'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13224,7 +13224,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 Phidget21 C Library $as_me 2.1.8.20120912, which was
+This file was extended by Phidget21 C Library $as_me 2.1.8.20121218, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13282,7 +13282,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="\\
-Phidget21 C Library config.status 2.1.8.20120912
+Phidget21 C Library config.status 2.1.8.20121218
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"