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 /admin/ChangeLog | |
| parent | 63d535c829a930207b64fe733228f15a554644b1 (diff) | |
| parent | 7a2657fa3bedbd977f4e11fe030cb4a210c04ab4 (diff) | |
| download | emacs-e078a23febca14bc919c5806670479c395e3253e.tar.gz emacs-e078a23febca14bc919c5806670479c395e3253e.zip | |
merge from trunk
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 6a6b1bd8da6..fa001ede6cb 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * check-doc-strings: Update for CVS->bzr, moved lispref/ directory. | ||
| 4 | |||
| 5 | * emacs-pretesters, make-announcement, make-changelog-diff: | ||
| 6 | Remove files. | ||
| 7 | |||
| 1 | 2012-12-14 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2012-12-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 9 | ||
| 3 | Fix permissions bugs with setgid directories etc. (Bug#13125) | 10 | Fix permissions bugs with setgid directories etc. (Bug#13125) |
| @@ -1665,7 +1672,7 @@ | |||
| 1665 | ;; coding: utf-8 | 1672 | ;; coding: utf-8 |
| 1666 | ;; End: | 1673 | ;; End: |
| 1667 | 1674 | ||
| 1668 | Copyright (C) 2001-2012 Free Software Foundation, Inc. | 1675 | Copyright (C) 2001-2013 Free Software Foundation, Inc. |
| 1669 | 1676 | ||
| 1670 | This file is part of GNU Emacs. | 1677 | This file is part of GNU Emacs. |
| 1671 | 1678 | ||