Merge tag 'upstream/3.12.0'

Upstream version 3.12.0

5 files changed, 12 insertions, 1 deletions

diff --git a/help/C/figures/icon.png b/help/C/figures/icon.png
new file mode 100644
index 0000000..8cfefc1
--- /dev/null
+++ b/help/C/figures/icon.png
diff --git a/help/C/figures/preferences.png b/help/C/figures/preferences.png
new file mode 100644
index 0000000..fe3bbe1
--- /dev/null
+++ b/help/C/figures/preferences.png
diff --git a/help/C/figures/scan_toolbar.png b/help/C/figures/scan_toolbar.png
new file mode 100644
index 0000000..7736d68
--- /dev/null
+++ b/help/C/figures/scan_toolbar.png
diff --git a/help/Makefile.am b/help/Makefile.am
index 66bca3c..fd8d7e8 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -2,6 +2,12 @@
 
 HELP_ID = simple-scan
 HELP_POT = simple-scan-help.pot
+
+HELP_MEDIA = \
+             figures/icon.png		\
+             figures/preferences.png	\
+             figures/scan_toolbar.png
+
 HELP_FILES = index.page \
              adf.page \
              crop.page \
diff --git a/help/Makefile.in b/help/Makefile.in
index f82d73f..59db376 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -230,6 +230,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 HELP_ID = simple-scan
 HELP_POT = simple-scan-help.pot
+HELP_MEDIA = \
+             figures/icon.png		\
+             figures/preferences.png	\
+             figures/scan_toolbar.png
+
 HELP_FILES = index.page \
              adf.page \
              crop.page \