diff options
| author | Tom Tromey | 2013-01-05 19:36:45 -0700 |
|---|---|---|
| committer | Tom Tromey | 2013-01-05 19:36:45 -0700 |
| commit | e078a23febca14bc919c5806670479c395e3253e (patch) | |
| tree | e9e4ed91feef744d525264c31974c3ed00146bcd /lib-src/ChangeLog | |
| parent | 63d535c829a930207b64fe733228f15a554644b1 (diff) | |
| parent | 7a2657fa3bedbd977f4e11fe030cb4a210c04ab4 (diff) | |
| download | emacs-e078a23febca14bc919c5806670479c395e3253e.tar.gz emacs-e078a23febca14bc919c5806670479c395e3253e.zip | |
merge from trunk
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 866e76ad24f..92b970eb778 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-01-01 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in (lisp1): Add macroexp.elc (bug#13320). | ||
| 4 | |||
| 1 | 2012-12-11 Juanma Barranquero <lekktu@gmail.com> | 5 | 2012-12-11 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * makefile.w32-in (SYSWAIT_H): Update dependencies. | 7 | * makefile.w32-in (SYSWAIT_H): Update dependencies. |
| @@ -8479,7 +8483,7 @@ | |||
| 8479 | ;; coding: utf-8 | 8483 | ;; coding: utf-8 |
| 8480 | ;; End: | 8484 | ;; End: |
| 8481 | 8485 | ||
| 8482 | Copyright (C) 1988-1999, 2001-2012 Free Software Foundation, Inc. | 8486 | Copyright (C) 1988-1999, 2001-2013 Free Software Foundation, Inc. |
| 8483 | 8487 | ||
| 8484 | This file is part of GNU Emacs. | 8488 | This file is part of GNU Emacs. |
| 8485 | 8489 | ||