diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /doc/lispintro | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'doc/lispintro')
| -rw-r--r-- | doc/lispintro/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispintro/Makefile.in | 3 | ||||
| -rw-r--r-- | doc/lispintro/doclicense.texi | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 1b7b803b39c..4320a29f60f 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -449,8 +449,8 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, + 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 91648e2d662..9dc31978630 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -1,7 +1,8 @@ #### Makefile for the Emacs Lisp Introduction manual # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, -# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/doc/lispintro/doclicense.texi b/doc/lispintro/doclicense.texi index 1aa76136110..51342e96d60 100644 --- a/doc/lispintro/doclicense.texi +++ b/doc/lispintro/doclicense.texi @@ -506,7 +506,3 @@ to permit their use in free software. @c ispell-local-pdict: "ispell-dict" @c End: -@ignore - arch-tag: 839f250e-4800-4bc9-bd28-49ec7968331f -@end ignore - |