]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Thu, 29 Aug 2019 18:11:21 +0000 (11:11 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 29 Aug 2019 18:11:21 +0000 (11:11 -0700)
commit5a3e501edd61e20454fff775d779d906185f3247
tree6cb56783c4ee24ecabc5cdfce512046f8be6df0b
parent6dd44926a31b811578b384293f520afa83a2dcad
parent290fe4d12281a848cb02f51d2dbf874cd30ab441
Merge from origin/emacs-26

290fe4d * ; ChangeLog.3 update
e8f176b * etc/NEWS: Delete temporary markup.

# Conflicts:
# ChangeLog.3
# etc/NEWS
ChangeLog.3
etc/NEWS.26