aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/changelogs
diff options
context:
space:
mode:
authorTom Tromey2013-07-06 23:18:58 -0600
committerTom Tromey2013-07-06 23:18:58 -0600
commit6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch)
treef5f331ea361ba0f99e0f9b638d183ad492a7da31 /admin/notes/changelogs
parent0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff)
parent219afb88d9d484393418820d1c08dc93299110ec (diff)
downloademacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz
emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.zip
merge from trunk
this merges frmo trunk and fixes various build issues. this needed a few ugly tweaks. this hangs in "make check" now
Diffstat (limited to 'admin/notes/changelogs')
-rw-r--r--admin/notes/changelogs5
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
5http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html 5http://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, 6http://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
9http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html 10http://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