diff options
| author | Paul Eggert | 2012-01-07 11:51:13 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-07 11:51:13 -0800 |
| commit | 9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch) | |
| tree | 3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /lib-src/ChangeLog | |
| parent | dbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff) | |
| parent | 6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff) | |
| download | emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index e989473219c..32054e68db2 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-01-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * ebrowse.c (version) <emacs_copyright>: | ||
| 4 | * etags.c (print_version) <emacs_copyright>: | ||
| 5 | * rcs2log (Copyright): Update short copyright year to 2012. | ||
| 6 | |||
| 1 | 2011-12-25 Andreas Schwab <schwab@linux-m68k.org> | 7 | 2011-12-25 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 8 | ||
| 3 | * etags.c (C_entries): Properly skip over string and character | 9 | * etags.c (C_entries): Properly skip over string and character |
| @@ -7930,7 +7936,7 @@ | |||
| 7930 | ;; coding: utf-8 | 7936 | ;; coding: utf-8 |
| 7931 | ;; End: | 7937 | ;; End: |
| 7932 | 7938 | ||
| 7933 | Copyright (C) 1988-1999, 2001-2011 Free Software Foundation, Inc. | 7939 | Copyright (C) 1988-1999, 2001-2012 Free Software Foundation, Inc. |
| 7934 | 7940 | ||
| 7935 | This file is part of GNU Emacs. | 7941 | This file is part of GNU Emacs. |
| 7936 | 7942 | ||