]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 309cefe 5a952eb)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 2 May 2016 01:07:56 +0000 (18:07 -0700)
5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings

1  2 
etc/NEWS patch | diff1 | diff2 | blob | history
src/image.c patch | diff1 | diff2 | blob | history

diff --cc etc/NEWS
Simple merge
diff --cc src/image.c
Simple merge