From: Stephen Leake Date: Wed, 24 Dec 2014 13:42:40 +0000 (-0600) Subject: resolve ChangeLog merge conflict X-Git-Tag: emacs-25.0.90~2634^2~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f3be0025481f15717198befe557208614e513e92;p=emacs.git resolve ChangeLog merge conflict --- f3be0025481f15717198befe557208614e513e92 diff --cc ChangeLog index a380abdc0b7,7e68314438d..d62ccf19799 --- a/ChangeLog +++ b/ChangeLog @@@ -1,26 -1,11 +1,34 @@@ +2014-12-23 Stephen Leake + + * CONTRIBUTE: add Savannah url, cleanup announcing freeze. + + 2014-12-23 Paul Eggert + + Merge from gnulib + 2014-12-20 utimens: remove unnecessary assert + 2014-12-16 stdalign: port better to HP compilers + 2014-12-16 stdalign: work around Apple GCC 4.0 bug + * lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib. + +2014-12-19 Stephen Leake + + Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi + + Fixes bug#19299 + + * CONTRIBUTE: Move user-level information to doc/emacs/trouble.texi + (commit messages): new, gathered from comments on emacs-devel + (Changelog notes): add reference to GNU coding standards section 5.2; + doc 'present tense', bug fix format + (branches): freeze announcements are made on info-gnu-emacs mailing + list + (git vs rename): new + + * doc/emacs/trouble.texi: Move user-level information from CONTRIBUTE here + + * lisp/startup.el (fancy-about-text): change buttons for etc/CONTRIBUTE + to (info "(emacs)Contributing") + 2014-12-14 Paul Eggert Spelling fixes