From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 11 Apr 2011 05:09:50 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942e4424d5f3a0d954fd9118e2785bd54fe95aab;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

942e4424d5f3a0d954fd9118e2785bd54fe95aab
diff --cc lib/depcomp
index 43bd0f9bc,e996e5d71..53bee03e9
--- a/lib/depcomp
+++ b/lib/depcomp
@@@ -1,10 -1,10 +1,10 @@@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
- scriptversion=2011-04-09-11; # UTC
+ scriptversion=2011-04-11-05; # UTC
  
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2011,
 -# Free Software Foundation, Inc.
 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 +# 2011 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