diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:30:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:30:33 -0700 |
| commit | 2393085c9ac30ac7378a39ee77760dfdecd4b509 (patch) | |
| tree | 233f1e457cff8a131c2acf5ba9c947f820e24a5a /ChangeLog | |
| parent | 7f55d4251806e4712762bef0a3ed41a53f850a58 (diff) | |
| parent | ad89f85067d068494009948e76f89c902f043513 (diff) | |
| download | emacs-2393085c9ac30ac7378a39ee77760dfdecd4b509.tar.gz | |
Merge from origin/emacs-24
ad89f85 Another minor improvement in ELisp manual (Bug#20168)
5e2951b Improve docs of 'posn-actual-col-row' (Bug#20169)
1291ce1 Minor documentation fix in ELisp manual (Bug#20174)
33e2236 * display.texi (Useless Whitespace): Fix thinko.
ff3878d * configure.ac: Fix jpeg version check to work with gcc >= 5.
90b46f5 Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
e7f92aa authors.el small additions
0bfe915 * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters.
c3c4b75 Fixes: debbugs:18939
Conflicts:
ChangeLog
doc/lispref/ChangeLog
etc/PROBLEMS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/simple.el
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c155708f1f4..a489ab9f9df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-03-23 Andreas Schwab <schwab@suse.de> + + * configure.ac: Fix jpeg version check to work with gcc >= 5. + 2015-03-21 Samer Masterson <samer@samertm.com> * CONTRIBUTE (Test your changes.): New section. |