From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 5 Jan 2015 22:09:00 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=420e5f1423ab2979ca291361e18795a6381b8fa5;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  maint: update copyright years to 2015 (branch 'master')
  maint: update copyright years to 2015 (branch 'micro')
---

420e5f1423ab2979ca291361e18795a6381b8fa5
diff --cc Makefile.am
index cfb6572b7,5fb94e606..a4a8e1ab7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,8 -1,8 +1,8 @@@
  ## Process this file with automake to create Makefile.in
  
 -## Makefile for Automake.
 +## Makefile for Automake NG.
  
- # Copyright (C) 1995-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1995-2015 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
diff --cc lib/missing
index 4110bbab9,3af282891..741ec426e
--- a/lib/missing
+++ b/lib/missing
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Common wrapper for a few potentially missing GNU programs.
  
 -scriptversion=2013-10-28.13; # UTC
 +scriptversion=2014-12-20.00; # UTC
  
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2015 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 m4/init.m4
index 4a00a90dc,723f6005c..79a6d4a73
--- a/m4/init.m4
+++ b/m4/init.m4
@@@ -1,6 -1,6 +1,6 @@@
 -# Do all the work for Automake.                             -*- Autoconf -*-
 +# Do all the work for Automake-NG.                         -*- Autoconf -*-
  
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2015 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
diff --cc maintainer/syntax-checks.mk
index 657de45e0,d5fff4825..d8abb4670
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@@ -1,6 -1,6 +1,6 @@@
 -# Maintainer checks for Automake.  Requires GNU make.
 +# Maintainer checks for Automake-NG.
  
- # Copyright (C) 2012-2014 Free Software Foundation, Inc.
+ # Copyright (C) 2012-2015 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