diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
| commit | e94622c319e4307617b202f19d3ec05b21a9bb49 (patch) | |
| tree | c5ddf44352b9bd47aeb3eb432ba79638079efe25 /testsuite/tools | |
| parent | 6f2255c9648b175d51e2c8e5e9670557f9dc4ee1 (diff) | |
merge to 1.0.25+git20150927
Diffstat (limited to 'testsuite/tools')
| -rw-r--r-- | testsuite/tools/Makefile.in | 4 | ||||
| -rw-r--r-- | testsuite/tools/data/html-backends-split.ref | 2 | ||||
| -rw-r--r-- | testsuite/tools/data/html-mfgs.ref | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/tools/Makefile.in b/testsuite/tools/Makefile.in index e02349b..677dea2 100644 --- a/testsuite/tools/Makefile.in +++ b/testsuite/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -205,6 +205,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +PNG_LIBS = @PNG_LIBS@ PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@ PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -221,6 +222,7 @@ SOCKET_LIBS = @SOCKET_LIBS@ STRICT_LDFLAGS = @STRICT_LDFLAGS@ STRIP = @STRIP@ SYSLOG_LIBS = @SYSLOG_LIBS@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ TIFF_LIBS = @TIFF_LIBS@ USB_LIBS = @USB_LIBS@ diff --git a/testsuite/tools/data/html-backends-split.ref b/testsuite/tools/data/html-backends-split.ref index b498c57..72fd949 100644 --- a/testsuite/tools/data/html-backends-split.ref +++ b/testsuite/tools/data/html-backends-split.ref @@ -16466,7 +16466,7 @@ Grandtek Scopecam <dt><b>Manufacturer:</b></dt> <dd>Manufacturer, vendor or brand name of the device.</dd> <dt><b>Model:</b></dt> - <dd>Name of the the device.</dd> + <dd>Name of the device.</dd> <dt><b>Interface:</b></dt> <dd>How the device is connected to the computer.</dd> <dt><b>USB id:</b></dt> diff --git a/testsuite/tools/data/html-mfgs.ref b/testsuite/tools/data/html-mfgs.ref index 3cbaaef..5e53ee3 100644 --- a/testsuite/tools/data/html-mfgs.ref +++ b/testsuite/tools/data/html-mfgs.ref @@ -23864,7 +23864,7 @@ qcam<br>(unmaintained) <blockquote> <dl> <dt><b>Model:</b></dt> - <dd>Name of the the device.</dd> + <dd>Name of the device.</dd> <dt><b>Interface:</b></dt> <dd>How the device is connected to the computer.</dd> <dt><b>USB id:</b></dt> |