diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /oldXMenu/ChangeLog | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'oldXMenu/ChangeLog')
| -rw-r--r-- | oldXMenu/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index b40b5ca7084..1d3091c6bb4 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog | |||
| @@ -167,7 +167,7 @@ | |||
| 167 | 2007-02-25 Glenn Morris <rgm@gnu.org> | 167 | 2007-02-25 Glenn Morris <rgm@gnu.org> |
| 168 | 168 | ||
| 169 | * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c: | 169 | * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c: |
| 170 | * XMakeAssoc.c: Remove license text in favour of including | 170 | * XMakeAssoc.c: Remove license text in favor of including |
| 171 | copyright.h, as was done in original X11 source. | 171 | copyright.h, as was done in original X11 source. |
| 172 | 172 | ||
| 173 | 2004-12-27 Jan Djärv <jan.h.d@swipnet.se> | 173 | 2004-12-27 Jan Djärv <jan.h.d@swipnet.se> |
| @@ -615,7 +615,7 @@ | |||
| 615 | ;; coding: utf-8 | 615 | ;; coding: utf-8 |
| 616 | ;; End: | 616 | ;; End: |
| 617 | 617 | ||
| 618 | Copyright (C) 1993-1999, 2001-2011 Free Software Foundation, Inc. | 618 | Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. |
| 619 | 619 | ||
| 620 | This file is part of GNU Emacs. | 620 | This file is part of GNU Emacs. |
| 621 | 621 | ||