summaryrefslogtreecommitdiff
path: root/help
diff options
context:
space:
mode:
authorAlessio Treglia <alessio@debian.org>2014-04-10 15:37:13 +0100
committerAlessio Treglia <alessio@debian.org>2014-04-10 15:37:13 +0100
commit0e3875acae9028d1abc1b23a13afa6d6d6a55232 (patch)
treea549b87482145f061c06ffd510a977bda7bcc3ac /help
parent168e62c2d48659ddf1250524614272c08b935b4a (diff)
parente9ca3b0060facd753744602a3baca5a1effdbd83 (diff)
Merge tag 'upstream/3.12.0'
Upstream version 3.12.0
Diffstat (limited to 'help')
-rw-r--r--help/C/figures/icon.pngbin0 -> 1559 bytes
-rw-r--r--help/C/figures/preferences.pngbin0 -> 14340 bytes
-rw-r--r--help/C/figures/scan_toolbar.pngbin0 -> 11975 bytes
-rw-r--r--help/Makefile.am6
-rw-r--r--help/Makefile.in7
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
Binary files differ
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
Binary files differ
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
Binary files differ
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 \