]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commitb57c1741abfb95da1dc6c165339551daff2ca3e1
treed3b51835457ca49fe59b311b5c72ee9cd272414dtree
parent309cefe0c2ecabc4ae10d6b86141b92f7c14e74ecommit | diff
parent5a952eb7f6a6b2a0a050cba618a4424e638a861acommit | diff
Merge from origin/emacs-25

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
etc/NEWS diff1 | diff2 | blob | history
src/image.c diff1 | diff2 | blob | history