aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /src/Makefile.in
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 045c6df1dae..6ee03177861 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
1# src/Makefile for GNU Emacs. 1# src/Makefile for GNU Emacs.
2 2
3# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2012 3# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2013 Free Software
4# Free Software Foundation, Inc. 4# Foundation, Inc.
5 5
6# This file is part of GNU Emacs. 6# This file is part of GNU Emacs.
7 7