]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'master' into ng/master
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 31 Dec 2012 17:30:40 +0000 (18:30 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 31 Dec 2012 17:30:40 +0000 (18:30 +0100)
* master:
  maint: update copyright year for 2013 (in branch master)
  maint: update copyright year for 2013 (in branch maint)

491 files changed:
1  2 
GNUmakefile
HACKING
Makefile.am
aclocal.in
automake.in
bootstrap.sh
configure.ac
contrib/check-html.am
contrib/t/local.am
contrib/t/parallel-tests-html-recursive.sh
contrib/t/parallel-tests-html.sh
doc/automake-ng.texi
gen-testsuite-part
lib/Automake/ChannelDefs.pm
lib/Automake/Channels.pm
lib/Automake/Config.in
lib/Automake/DisjConditions.pm
lib/Automake/ItemDef.pm
lib/Automake/Location.pm
lib/Automake/Options.pm
lib/Automake/Rule.pm
lib/Automake/RuleDef.pm
lib/Automake/VarDef.pm
lib/Automake/Variable.pm
lib/am/compile.am
lib/am/configure.am
lib/am/data.am
lib/am/dejagnu.mk
lib/am/depend2.am
lib/am/footer.am
lib/am/java.am
lib/am/lang-compile.am
lib/am/lex.am
lib/am/library.am
lib/am/libs.am
lib/am/lisp.am
lib/am/ltlib.am
lib/am/ltlibrary.am
lib/am/mans.am
lib/am/program.am
lib/am/progs.am
lib/am/python.am
lib/am/remake-hdr.am
lib/am/scripts.am
lib/am/subdirs.mk
lib/am/texi-vers.am
lib/am/yacc.am
lib/ar-lib
lib/compile
lib/depcomp
lib/mdate-sh
lib/missing
lib/py-compile
lib/tap-driver.pl
lib/tap-driver.sh
lib/test-driver
lib/ylwrap
m4/depend.m4
m4/init.m4
m4/silent.m4
m4/strip.m4
m4/substnot.m4
maint.mk
runtest.in
syntax-checks.mk
t/aclocal-deps.sh
t/add-missing-multiple.sh
t/add-missing.tap
t/all2.sh
t/am-default-source-ext.sh
t/amopts-variable-expansion.sh
t/autodist-aclocal-m4.sh
t/autodist-configure-no-subdir.sh
t/autodist-stamp-vti.sh
t/autodist-subdir.sh
t/autodist.sh
t/autohdr-subdir-pr12495.sh
t/autohdr3.sh
t/auxdir.sh
t/auxdir6.sh
t/auxdir7.sh
t/auxdir8.sh
t/ax/am-test-lib.sh
t/ax/depcomp.sh
t/ax/distcheck-hook-m4.am
t/ax/shell-no-trail-bslash.in
t/ax/tap-summary-aux.sh
t/ax/test-lib.sh
t/ax/testsuite-summary-checks.sh
t/built-sources-fork-bomb.sh
t/built-sources.sh
t/canon.sh
t/canon5.sh
t/ccnoco2.sh
t/ccnoco3.sh
t/check-concurrency-bug9245.sh
t/check10.sh
t/check11.sh
t/check12.sh
t/check2.sh
t/check4.sh
t/check5.sh
t/check7.sh
t/check8.sh
t/colon5.sh
t/colon6.sh
t/colon7.sh
t/color-tests.sh
t/color-tests2.sh
t/comment4.sh
t/comment6.sh
t/comment8.sh
t/cond30.sh
t/cond38.sh
t/condlib.sh
t/condman3.sh
t/confdeps.sh
t/conffile-leading-dot.sh
t/confh.sh
t/confh4.sh
t/confh8.sh
t/conflnk2.sh
t/cscope.tap
t/cxx-lt-demo.sh
t/dejagnu2.sh
t/deleted-am.sh
t/deleted-m4.sh
t/depcomp-implicit-auxdir.sh
t/depcomp-shuffle-vpath.sh
t/depcomp8a.sh
t/depcomp8b.sh
t/depdist.sh
t/depend.sh
t/depend4.sh
t/dist-auxfile-2.sh
t/dist-auxfile.sh
t/dist-formats.tap
t/dist-missing-am.sh
t/dist-missing-included-m4.sh
t/dist-missing-m4.sh
t/dist-obsolete-opts.sh
t/dist-repeated.sh
t/distcheck-configure-flags-am.sh
t/distcheck-configure-flags-subpkg.sh
t/distcheck-configure-flags.sh
t/distcheck-hook.sh
t/distcheck-hook2.sh
t/distcheck-missing-m4.sh
t/distcheck-outdated-m4.sh
t/distcheck-override-infodir.sh
t/distcheck-pr10470.sh
t/distcheck-pr9579.sh
t/distcom-subdir.sh
t/distcom3.sh
t/distcom4.sh
t/distcom5.sh
t/distdir.sh
t/distlinksbrk.sh
t/dollar.sh
t/exeext.sh
t/exeext4.sh
t/exsource.sh
t/ext.sh
t/ext2.sh
t/extra10.sh
t/extra11.sh
t/extra12.sh
t/flavor.sh
t/fort2.sh
t/fort4.sh
t/fort5.sh
t/gcj.sh
t/gettext-config-rpath.sh
t/gettext-macros.sh
t/gettext.sh
t/gettext2.sh
t/gnits2.sh
t/gnits3.sh
t/gnumake.sh
t/hdr-vars-defined-once.sh
t/insh2.sh
t/installdir.sh
t/instdir-java.sh
t/instdir-lisp.sh
t/instdir-ltlib.sh
t/instdir-no-empty.sh
t/instdir-prog.sh
t/instdir-python.sh
t/instdir-texi.sh
t/instdir.sh
t/instdir2.sh
t/insthook.sh
t/instmany-mans.sh
t/instmany-python.sh
t/instmany.sh
t/instspc.tap
t/java-compile-install.sh
t/java-compile-run-flat.sh
t/java-compile-run-nested.sh
t/java-nobase.sh
t/java.sh
t/javaflags.sh
t/lex-depend-cxx.sh
t/lex-depend.sh
t/lex-header.sh
t/lex-lib-external.sh
t/lex-libobj.sh
t/lex-line.sh
t/lex-nodist.sh
t/lex-noyywrap.sh
t/lex-subobj-nodep.sh
t/lex3.sh
t/lex5.sh
t/lflags.sh
t/lflags2.sh
t/libobj19.sh
t/libobj20b.sh
t/libobj20c.sh
t/libobj7.sh
t/library2.sh
t/libtoo10.sh
t/libtool3.sh
t/libtool7.sh
t/libtool9.sh
t/link_cond.sh
t/lisp-flags.sh
t/lisp8.sh
t/location.sh
t/longline.sh
t/make-dryrun.tap
t/makej.sh
t/makej2.sh
t/maken.sh
t/maken3.sh
t/man3.sh
t/man6.sh
t/man8.sh
t/mdate2.sh
t/mkinst3.sh
t/no-extra-makefile-code.sh
t/no-spurious-install-recursive.sh
t/nodist.sh
t/nodist3.sh
t/noinst.sh
t/nostdinc.sh
t/objc-basic.sh
t/objcxx-basic.sh
t/output11.sh
t/output6.sh
t/override-conditional-1.sh
t/parallel-tests-basics.sh
t/parallel-tests-concurrency-2.sh
t/parallel-tests-concurrency.sh
t/parallel-tests-empty.sh
t/parallel-tests-exeext.sh
t/parallel-tests-exit-statuses.sh
t/parallel-tests-extra-programs.sh
t/parallel-tests-fd-redirect-exeext.sh
t/parallel-tests-fd-redirect.sh
t/parallel-tests-fork-bomb.sh
t/parallel-tests-generated-and-distributed.sh
t/parallel-tests-harderror.sh
t/parallel-tests-log-compiler-1.sh
t/parallel-tests-log-override.sh
t/parallel-tests-logvars-example.sh
t/parallel-tests-no-color-in-log.sh
t/parallel-tests-recheck-pr11791.sh
t/parallel-tests-recheck.sh
t/parallel-tests-srcdir-in-test-name.sh
t/parallel-tests-suffix-prog.sh
t/parallel-tests-unreadable.sh
t/pattern-rules.sh
t/pattern-rules2.sh
t/per-target-flags.sh
t/phony.sh
t/pluseq3.sh
t/posixsubst-ldadd.sh
t/posixsubst-libraries.sh
t/posixsubst-ltlibraries.sh
t/posixsubst-sources.sh
t/pr2.sh
t/pr224.sh
t/pr401.sh
t/pr401b.sh
t/pr401c.sh
t/pr87.sh
t/pr9.sh
t/primary-prefix-couples-force-valid.sh
t/primary-prefix-valid-couples.sh
t/python-virtualenv.sh
t/recurs-user-keep-going.sh
t/recurs-user-phony.sh
t/recurs-user-wrap.sh
t/relativize.tap
t/remake-after-acinclude-m4.sh
t/remake-after-aclocal-m4.sh
t/remake-after-configure-ac.sh
t/remake-after-makefile-am.sh
t/remake-all-1.sh
t/remake-deleted-m4-file.sh
t/remake-gnulib-add-acsubst.sh
t/remake-gnulib-add-header.sh
t/remake-gnulib-remove-header.sh
t/remake-include-aclocal.sh
t/remake-include-configure.sh
t/remake-include-makefile.sh
t/remake-makefile-intree.sh
t/remake-makefile-vpath.sh
t/remake-mild-stress.sh
t/remake-moved-m4-file.sh
t/remake-not-after-make-dist.sh
t/remake-recurs-user.sh
t/remake-renamed-am.sh
t/remake-renamed-m4-file.sh
t/remake-renamed-m4-macro-and-file.sh
t/remake-renamed-m4-macro.sh
t/remake-subdir-from-subdir.sh
t/remake-subdir-gnu.sh
t/remake-subdir-grepping.sh
t/remake-subdir-long-time.sh
t/remake-subdir.sh
t/remake-timing-bug-pr8365.sh
t/repeated-options.sh
t/self-check-dir.tap
t/self-check-shell-no-trail-bslash.sh
t/serial-tests.sh
t/silent-c.sh
t/silent-configsite.sh
t/silent-custom.sh
t/silent-cxx.sh
t/silent-f77.sh
t/silent-f90.sh
t/silent-lex.sh
t/silent-lt.sh
t/silent-many-languages.sh
t/silent-texi.sh
t/silent-yacc.sh
t/specflg-dummy.sh
t/specflg6.sh
t/spell.sh
t/spell2.sh
t/stdinc-no-repeated.sh
t/subdir-order.sh
t/subdir.sh
t/subobj-clean-lt-pr10697.sh
t/subobj-clean-pr10697.sh
t/subobj-cxx-grep.sh
t/subobj10.sh
t/subobj11a.sh
t/subobj5.sh
t/subobj8.sh
t/subobj9.sh
t/subpkg-yacc.sh
t/subpkg.sh
t/substref.sh
t/suffix-chain.sh
t/suffix-custom-subobj-and-specflg.sh
t/suffix-custom-subobj.sh
t/suffix-obj.sh
t/suffix.sh
t/suffix10.sh
t/suffix2.sh
t/suffix5.sh
t/suffix8.sh
t/suffix9.sh
t/tags-id.sh
t/tags-pr12372.sh
t/tap-autonumber.sh
t/tap-bad-prog.tap
t/tap-bailout-leading-space.sh
t/tap-bailout-suppress-later-errors.sh
t/tap-bailout.sh
t/tap-basic.sh
t/tap-color.sh
t/tap-common-setup.sh
t/tap-deps.sh
t/tap-diagnostic-custom.sh
t/tap-diagnostic.sh
t/tap-doc.sh
t/tap-doc2.sh
t/tap-global-log.sh
t/tap-global-result.sh
t/tap-lazy-check.sh
t/tap-log.sh
t/tap-merge-stdout-stderr.sh
t/tap-more.sh
t/tap-more2.sh
t/tap-msg0-bailout.sh
t/tap-msg0-planskip.sh
t/tap-out-of-order.sh
t/tap-passthrough-exit.sh
t/tap-passthrough.sh
t/tap-plan-corner.sh
t/tap-plan-leading-zero.sh
t/tap-plan-malformed.sh
t/tap-plan-middle.sh
t/tap-plan-whitespace.sh
t/tap-plan.sh
t/tap-planskip-and-logging.sh
t/tap-planskip-case-insensitive.sh
t/tap-planskip-late.sh
t/tap-planskip-unplanned-corner.sh
t/tap-planskip-whitespace.sh
t/tap-planskip.sh
t/tap-realtime.sh
t/tap-recheck.sh
t/tap-signal.tap
t/tap-test-number-0.sh
t/tap-todo-skip.sh
t/tap-unplanned.sh
t/targetclash.sh
t/test-driver-acsubst.sh
t/test-driver-cond.sh
t/test-driver-create-log-dir.sh
t/test-driver-custom-multitest-recheck.sh
t/test-driver-custom-multitest-recheck2.sh
t/test-driver-custom-multitest.sh
t/test-driver-custom-xfail-tests.sh
t/test-driver-custom.sh
t/test-driver-fail.sh
t/test-driver-is-distributed.sh
t/test-driver-strip-vpath.sh
t/test-extensions-cond.sh
t/test-extensions-invalid.sh
t/test-log.sh
t/test-metadata-global-log.sh
t/test-metadata-global-result.sh
t/test-metadata-recheck.sh
t/test-metadata-results.sh
t/test-missing.sh
t/test-trs-basic.sh
t/test-trs-recover-parallel.sh
t/test-trs-recover.sh
t/testsuite-summary-count-many.sh
t/testsuite-summary-reference-log.sh
t/transform3.sh
t/txinfo-add-missing-and-dist.sh
t/txinfo-makeinfo-error-no-clobber.sh
t/txinfo-many-output-formats.sh
t/txinfo-no-extra-dist.sh
t/txinfo-setfilename-repeated.sh
t/txinfo-tex-dist.sh
t/txinfo-vtexi.sh
t/txinfo-vtexi2.sh
t/txinfo-vtexi3.sh
t/txinfo-vtexi4.sh
t/uninstall-fail.sh
t/vala-headers.sh
t/vala-libs.sh
t/vala-mix.sh
t/vala-mix2.sh
t/vala-non-recursive-setup.sh
t/vala-parallel.sh
t/vala-per-target-flags.sh
t/vala-recursive-setup.sh
t/vala-vapi.sh
t/vala-vpath.sh
t/vars-assign.sh
t/vartar.sh
t/vartypos.sh
t/version7.sh
t/vpath.sh
t/warning-groups-win-over-strictness.sh
t/warnings-override.sh
t/warnings-precedence.sh
t/warnings-strictness-interactions.sh
t/warnings-win-over-strictness.sh
t/warnopts.sh
t/werror.sh
t/werror2.sh
t/werror3.sh
t/xsource.sh
t/yacc-auxdir.sh
t/yacc-basic.sh
t/yacc-bison-skeleton-cxx.sh
t/yacc-bison-skeleton.sh
t/yacc-cxx.sh
t/yacc-d-basic.sh
t/yacc-d-cxx.sh
t/yacc-deleted-headers.sh
t/yacc-depend2.sh
t/yacc-dist-nobuild-subdir.sh
t/yacc-dist-nobuild.sh
t/yacc-grepping2.sh
t/yacc-line.sh
t/yacc-mix-c-cxx.sh
t/yacc-nodist.sh
t/yacc-subdir.sh
t/yflags-cmdline-override.sh
t/yflags.sh
t/yflags2.sh

diff --cc GNUmakefile
Simple merge
diff --cc HACKING
Simple merge
diff --cc Makefile.am
Simple merge
diff --cc aclocal.in
Simple merge
diff --cc automake.in
Simple merge
diff --cc bootstrap.sh
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/am/data.am
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/am/java.am
Simple merge
Simple merge
diff --cc lib/am/lex.am
Simple merge
Simple merge
diff --cc lib/am/libs.am
Simple merge
diff --cc lib/am/lisp.am
Simple merge
diff --cc lib/am/ltlib.am
Simple merge
Simple merge
diff --cc lib/am/mans.am
Simple merge
Simple merge
diff --cc lib/am/progs.am
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/am/yacc.am
Simple merge
diff --cc lib/ar-lib
Simple merge
diff --cc lib/compile
Simple merge
diff --cc lib/depcomp
Simple merge
diff --cc lib/mdate-sh
Simple merge
diff --cc lib/missing
index 4e7fc4827faf3267d770eec6e96fc3b67cd1ecb8,cdea514931f558be2bcc47ef2d52e14ab395520b..cf418e43d212f9149607385488a089abb75083da
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Common wrapper for a few potentially missing GNU programs.
  
 -scriptversion=2012-06-26.16; # UTC
 +scriptversion=2012-06-27.11; # UTC
  
- # Copyright (C) 1996-2012 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
  # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
diff --cc lib/py-compile
Simple merge
Simple merge
Simple merge
diff --cc lib/test-driver
Simple merge
diff --cc lib/ylwrap
Simple merge
diff --cc m4/depend.m4
Simple merge
diff --cc m4/init.m4
index febfe895a8f787909803b1ceab6321c099b8c3db,753570606e87136f11056001102356ac0050d7ea..aa32ca6811b68a071b8c5131ffbf8e2ff9fa99f3
@@@ -1,6 -1,6 +1,6 @@@
 -# Do all the work for Automake.                             -*- Autoconf -*-
 +# Do all the work for Automake-NG.                         -*- Autoconf -*-
  
- # Copyright (C) 1996-2012 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff --cc m4/silent.m4
Simple merge
diff --cc m4/strip.m4
Simple merge
diff --cc m4/substnot.m4
Simple merge
diff --cc maint.mk
Simple merge
diff --cc runtest.in
Simple merge
index 1231d6b795807c79cd353e1773d114b635f64e23,05ed15ec308f469ded299b293b53e930b42c349b..fc62b7ce9d2aecbe5ae975d14d6814dceea08252
@@@ -1,6 -1,6 +1,6 @@@
 -# Maintainer checks for Automake.  Requires GNU make.
 +# Maintainer checks for Automake-NG.
  
- # Copyright (C) 2012 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2013 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
Simple merge
Simple merge
Simple merge
diff --cc t/all2.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/autodist.sh
Simple merge
Simple merge
diff --cc t/autohdr3.sh
Simple merge
diff --cc t/auxdir.sh
Simple merge
diff --cc t/auxdir6.sh
Simple merge
diff --cc t/auxdir7.sh
Simple merge
diff --cc t/auxdir8.sh
Simple merge
Simple merge
diff --cc t/ax/depcomp.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/canon.sh
Simple merge
diff --cc t/canon5.sh
Simple merge
diff --cc t/ccnoco2.sh
Simple merge
diff --cc t/ccnoco3.sh
Simple merge
Simple merge
diff --cc t/check10.sh
Simple merge
diff --cc t/check11.sh
Simple merge
diff --cc t/check12.sh
Simple merge
diff --cc t/check2.sh
Simple merge
diff --cc t/check4.sh
Simple merge
diff --cc t/check5.sh
Simple merge
diff --cc t/check7.sh
Simple merge
diff --cc t/check8.sh
Simple merge
diff --cc t/colon5.sh
Simple merge
diff --cc t/colon6.sh
Simple merge
diff --cc t/colon7.sh
Simple merge
Simple merge
Simple merge
diff --cc t/comment4.sh
Simple merge
diff --cc t/comment6.sh
Simple merge
diff --cc t/comment8.sh
Simple merge
diff --cc t/cond30.sh
Simple merge
diff --cc t/cond38.sh
Simple merge
diff --cc t/condlib.sh
Simple merge
diff --cc t/condman3.sh
Simple merge
diff --cc t/confdeps.sh
Simple merge
Simple merge
diff --cc t/confh.sh
Simple merge
diff --cc t/confh4.sh
Simple merge
diff --cc t/confh8.sh
Simple merge
diff --cc t/conflnk2.sh
Simple merge
diff --cc t/cscope.tap
Simple merge
Simple merge
diff --cc t/dejagnu2.sh
Simple merge
diff --cc t/deleted-am.sh
Simple merge
diff --cc t/deleted-m4.sh
Simple merge
Simple merge
index 11d4a7ed77c6fab1298a8287746a866145937b2a,0000000000000000000000000000000000000000..2f682d264e77cb46f5508620cfb20a9cbda44ea2
mode 100755,000000..100755
--- /dev/null
@@@ -1,23 -1,0 +1,22 @@@
- #! /bin/sh
 +# Copyright (C) 2012 Free Software Foundation, Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2, or (at your option)
 +# any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
 +# Dependency tracking in the face of added/removed/renamed files.
 +#  - VPATH build
 +#  - no use of subdir objects
 +
 +. test-lib.sh
 +xdir='' vpath='yes'
 +. depcomp-shuffle.sh
diff --cc t/depcomp8a.sh
Simple merge
diff --cc t/depcomp8b.sh
Simple merge
diff --cc t/depdist.sh
Simple merge
diff --cc t/depend.sh
Simple merge
diff --cc t/depend4.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/distcom3.sh
Simple merge
diff --cc t/distcom4.sh
Simple merge
diff --cc t/distcom5.sh
Simple merge
diff --cc t/distdir.sh
Simple merge
Simple merge
diff --cc t/dollar.sh
Simple merge
diff --cc t/exeext.sh
Simple merge
diff --cc t/exeext4.sh
Simple merge
diff --cc t/exsource.sh
Simple merge
diff --cc t/ext.sh
Simple merge
diff --cc t/ext2.sh
Simple merge
diff --cc t/extra10.sh
Simple merge
diff --cc t/extra11.sh
Simple merge
diff --cc t/extra12.sh
Simple merge
diff --cc t/flavor.sh
Simple merge
diff --cc t/fort2.sh
Simple merge
diff --cc t/fort4.sh
Simple merge
diff --cc t/fort5.sh
Simple merge
diff --cc t/gcj.sh
Simple merge
Simple merge
Simple merge
diff --cc t/gettext.sh
Simple merge
diff --cc t/gettext2.sh
Simple merge
diff --cc t/gnits2.sh
Simple merge
diff --cc t/gnits3.sh
Simple merge
diff --cc t/gnumake.sh
Simple merge
Simple merge
diff --cc t/insh2.sh
Simple merge
diff --cc t/installdir.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/instdir.sh
Simple merge
diff --cc t/instdir2.sh
Simple merge
diff --cc t/insthook.sh
Simple merge
Simple merge
Simple merge
diff --cc t/instmany.sh
Simple merge
diff --cc t/instspc.tap
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/java.sh
Simple merge
diff --cc t/javaflags.sh
Simple merge
Simple merge
diff --cc t/lex-depend.sh
Simple merge
diff --cc t/lex-header.sh
Simple merge
Simple merge
diff --cc t/lex-libobj.sh
Simple merge
diff --cc t/lex-line.sh
Simple merge
diff --cc t/lex-nodist.sh
Simple merge
Simple merge
Simple merge
diff --cc t/lex3.sh
Simple merge
diff --cc t/lex5.sh
Simple merge
diff --cc t/lflags.sh
Simple merge
diff --cc t/lflags2.sh
Simple merge
diff --cc t/libobj19.sh
Simple merge
diff --cc t/libobj20b.sh
Simple merge
diff --cc t/libobj20c.sh
Simple merge
diff --cc t/libobj7.sh
Simple merge
diff --cc t/library2.sh
Simple merge
diff --cc t/libtoo10.sh
Simple merge
diff --cc t/libtool3.sh
Simple merge
diff --cc t/libtool7.sh
Simple merge
diff --cc t/libtool9.sh
Simple merge
diff --cc t/link_cond.sh
Simple merge
diff --cc t/lisp-flags.sh
Simple merge
diff --cc t/lisp8.sh
Simple merge
diff --cc t/location.sh
Simple merge
diff --cc t/longline.sh
Simple merge
Simple merge
diff --cc t/makej.sh
Simple merge
diff --cc t/makej2.sh
Simple merge
diff --cc t/maken.sh
Simple merge
diff --cc t/maken3.sh
Simple merge
diff --cc t/man3.sh
Simple merge
diff --cc t/man6.sh
Simple merge
diff --cc t/man8.sh
Simple merge
diff --cc t/mdate2.sh
Simple merge
diff --cc t/mkinst3.sh
Simple merge
Simple merge
Simple merge
diff --cc t/nodist.sh
Simple merge
diff --cc t/nodist3.sh
Simple merge
diff --cc t/noinst.sh
Simple merge
diff --cc t/nostdinc.sh
Simple merge
diff --cc t/objc-basic.sh
Simple merge
Simple merge
diff --cc t/output11.sh
Simple merge
diff --cc t/output6.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/phony.sh
Simple merge
diff --cc t/pluseq3.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/pr2.sh
Simple merge
diff --cc t/pr224.sh
Simple merge
diff --cc t/pr401.sh
Simple merge
diff --cc t/pr401b.sh
Simple merge
diff --cc t/pr401c.sh
Simple merge
diff --cc t/pr87.sh
Simple merge
diff --cc t/pr9.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/silent-c.sh
Simple merge
Simple merge
Simple merge
diff --cc t/silent-cxx.sh
Simple merge
diff --cc t/silent-f77.sh
Simple merge
diff --cc t/silent-f90.sh
Simple merge
diff --cc t/silent-lex.sh
Simple merge
diff --cc t/silent-lt.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/specflg6.sh
Simple merge
diff --cc t/spell.sh
Simple merge
diff --cc t/spell2.sh
Simple merge
index 6fe775bfbaffe7947f330d9aca178cd11c76230a,b87ceb8bd8d16e1c284bb91a69553e7202c59156..48fcf95dbf8c2b1ed2dfb48dd576d62c30779f16
@@@ -1,5 -1,5 +1,5 @@@
- #!/bin/sh
+ #! /bin/sh
 -# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 +# Copyright (C) 2009-2012 Free Software Foundation, Inc.
  #
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
Simple merge
diff --cc t/subdir.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/subobj10.sh
Simple merge
diff --cc t/subobj11a.sh
Simple merge
diff --cc t/subobj5.sh
Simple merge
diff --cc t/subobj8.sh
Simple merge
diff --cc t/subobj9.sh
Simple merge
Simple merge
diff --cc t/subpkg.sh
Simple merge
diff --cc t/substref.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/suffix-obj.sh
Simple merge
diff --cc t/suffix.sh
Simple merge
diff --cc t/suffix10.sh
Simple merge
diff --cc t/suffix2.sh
Simple merge
diff --cc t/suffix5.sh
Simple merge
diff --cc t/suffix8.sh
Simple merge
diff --cc t/suffix9.sh
Simple merge
diff --cc t/tags-id.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/tap-basic.sh
Simple merge
diff --cc t/tap-color.sh
Simple merge
Simple merge
diff --cc t/tap-deps.sh
Simple merge
Simple merge
Simple merge
diff --cc t/tap-doc.sh
Simple merge
diff --cc t/tap-doc2.sh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/tap-log.sh
Simple merge
Simple merge
diff --cc t/tap-more.sh
Simple merge
diff --cc t/tap-more2.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/tap-plan.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/test-log.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/transform3.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/vala-libs.sh
Simple merge
diff --cc t/vala-mix.sh
Simple merge
diff --cc t/vala-mix2.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/vala-vapi.sh
Simple merge
diff --cc t/vala-vpath.sh
Simple merge
Simple merge
diff --cc t/vartar.sh
Simple merge
diff --cc t/vartypos.sh
Simple merge
diff --cc t/version7.sh
Simple merge
diff --cc t/vpath.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/warnopts.sh
Simple merge
diff --cc t/werror.sh
Simple merge
diff --cc t/werror2.sh
Simple merge
diff --cc t/werror3.sh
Simple merge
diff --cc t/xsource.sh
Simple merge
Simple merge
diff --cc t/yacc-basic.sh
Simple merge
Simple merge
Simple merge
diff --cc t/yacc-cxx.sh
Simple merge
Simple merge
diff --cc t/yacc-d-cxx.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/yacc-line.sh
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/yflags.sh
Simple merge
diff --cc t/yflags2.sh
Simple merge