]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'maint'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 17 Jan 2010 11:08:50 +0000 (12:08 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 17 Jan 2010 11:08:50 +0000 (12:08 +0100)
1  2 
Makefile.in
aclocal.m4
automake.in
doc/Makefile.in
doc/automake.texi
lib/Automake/Makefile.in
lib/Automake/tests/Makefile.in
lib/Makefile.in
lib/am/Makefile.in
m4/Makefile.in
tests/Makefile.in

diff --cc Makefile.in
Simple merge
diff --cc aclocal.m4
index 01c6b138005b24dc446bbf3a1a15e990ca837416,d7cbc11ef023c4399a476601ae5c68434953fa5b..3c960a3c62e2fe0097f98a05d4af287044ade714
@@@ -1,7 -1,7 +1,7 @@@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11a -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+ # 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc automake.in
index 1d1f40c8c95fdca75c45afc3862f2354a0e5944d,8692d61f8a5ab355b3b3add96492efc90ee1b1e2..482972b78614d9b853e527dd292e87c15687d150
mode 100644,100755..100644
diff --cc doc/Makefile.in
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
diff --cc m4/Makefile.in
Simple merge
Simple merge