]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8586d4 317b354)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Sun, 2 Dec 2018 18:32:24 +0000 (10:32 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 2 Dec 2018 18:32:24 +0000 (10:32 -0800)
commitb6935dbe1816379dd6a9ffc14b2eaa4435003187
tree1417fc291003192db440de9e69cc1269edd80c33tree | snapshot
parente8586d46f774283b4efe9f34e3a6570d1a19edfacommit | diff
parent317b3547820bf2468c1c0e9b5bed1bde94aeb544commit | diff
Merge from origin/emacs-26

317b354 ; Add notes about cross-compiling macOS versions
4b176eb Fix macOS run-time feature check
c03574b * etc/NEWS-*: Fix capitalization of "Emacs"

# Conflicts:
# etc/NEWS
etc/NEWS.1-17 diff1 | diff2 | blob | history
etc/NEWS.18 diff1 | diff2 | blob | history
etc/NEWS.19 diff1 | diff2 | blob | history
etc/NEWS.20 diff1 | diff2 | blob | history
etc/NEWS.26 diff1 | | blob | history
src/nsterm.m diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.