diff options
| author | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-01-21 20:36:42 +0900 |
| commit | 678fb7066698ebfe3aecba722294025ed26da01b (patch) | |
| tree | 951ac3055141d950974051d13c10e5d7c6a98e31 /lib-src/ChangeLog | |
| parent | 71784361eb381ec2b12bd8283724a7addec49079 (diff) | |
| parent | 959ad23fb9020a121c4520946835e9f0aeb9bcb2 (diff) | |
| download | emacs-678fb7066698ebfe3aecba722294025ed26da01b.tar.gz emacs-678fb7066698ebfe3aecba722294025ed26da01b.zip | |
merge 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 | ||