summaryrefslogtreecommitdiff
path: root/help
diff options
context:
space:
mode:
authorAlessio Treglia <alessio@debian.org>2013-01-15 00:46:37 +0000
committerAlessio Treglia <alessio@debian.org>2013-01-15 00:46:37 +0000
commit8f1bef0c8abe53da0001b0d4df1f5439fecd9c3b (patch)
tree67137e06f48cbe06c0bf16052ea446edf63eb7a0 /help
parentd723aded8c1b91731f391754358750e9119d6689 (diff)
parentb99db4e5834bb8668c249bb7ce30af9a4d23527e (diff)
Merge tag 'upstream/3.6.0'
Upstream version 3.6.0
Diffstat (limited to 'help')
-rw-r--r--help/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/help/Makefile.in b/help/Makefile.in
index ea8ba68..73e6c26 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,