diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /admin/notes/changelogs | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'admin/notes/changelogs')
| -rw-r--r-- | admin/notes/changelogs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/admin/notes/changelogs b/admin/notes/changelogs index 2e954570ce8..ae9ce40aa0a 100644 --- a/admin/notes/changelogs +++ b/admin/notes/changelogs | |||
| @@ -3,8 +3,9 @@ entry in their name, not yours. | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html | 5 | http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html |
| 6 | There is no need to make change log entries for files such as NEWS, | 6 | http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00485.html |
| 7 | MAINTAINERS, and FOR-RELEASE. | 7 | There is no need to make trivial change log entries for files such |
| 8 | as NEWS, MAINTAINERS, and FOR-RELEASE. | ||
| 8 | 9 | ||
| 9 | http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html | 10 | http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html |
| 10 | There is no need to indicate regeneration of files such as configure | 11 | There is no need to indicate regeneration of files such as configure |