diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /admin/notes | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/changelogs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/admin/notes/changelogs b/admin/notes/changelogs index ae9ce40aa0a..1025cfc217f 100644 --- a/admin/notes/changelogs +++ b/admin/notes/changelogs | |||
| @@ -3,9 +3,10 @@ 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 | http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00485.html | 6 | There is no need to make change log entries for files such as NEWS, |
| 7 | There is no need to make trivial change log entries for files such | 7 | MAINTAINERS, and FOR-RELEASE. |
| 8 | as NEWS, MAINTAINERS, and FOR-RELEASE. | 8 | "There is no need" means you don't have to, but you can if you want to. |
| 9 | |||
| 9 | 10 | ||
| 10 | http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html | 11 | http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html |
| 11 | There is no need to indicate regeneration of files such as configure | 12 | There is no need to indicate regeneration of files such as configure |