aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-01-26 23:27:41 -0800
committerPaul Eggert2011-01-26 23:27:41 -0800
commit6bead3366761b64a2a30509fb41bb4d0fca68fbe (patch)
tree70114f0d55427e2e4cc9e306ab2cece34151ad3a /src
parent11ea68ce8ab1b5e0bde08f2f150b09abcffb4283 (diff)
parent125c3718c28a9f7ebba9d4a96f6c75a07f8797b6 (diff)
downloademacs-6bead3366761b64a2a30509fb41bb4d0fca68fbe.tar.gz
emacs-6bead3366761b64a2a30509fb41bb4d0fca68fbe.zip
Merge: fix two m4/gnulib-*.m4 file names that clashed under MS-DOS
Diffstat (limited to 'src')
-rw-r--r--src/config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/config.in b/src/config.in
index f414f81fb43..c08f10be178 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,8 +1,9 @@
1/* src/config.in. Generated from configure.in by autoheader. */ 1/* src/config.in. Generated from configure.in by autoheader. */
2 2
3/* GNU Emacs site configuration template file. 3/* GNU Emacs site configuration template file.
4 Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 4
5 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. 5Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2011
6 Free Software Foundation, Inc.
6 7
7This file is part of GNU Emacs. 8This file is part of GNU Emacs.
8 9