]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d40f966 c8ea14e)
Merge from origin/emacs-29
authorMichael Albinus <michael.albinus@gmx.de>
Fri, 13 Oct 2023 14:18:06 +0000 (16:18 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Fri, 13 Oct 2023 14:18:06 +0000 (16:18 +0200)
commitbbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3
tree12a21781a8aad9864e6b9e078159f38d4f6111f7tree | snapshot
parentd40f9668f9cf1dedaef3ce435498f89fe2c36385commit | diff
parentc8ea14e7825d536f41a230fc1298341a2462635ecommit | diff
Merge from origin/emacs-29

c8ea14e7825 Handle quoted tilde in Tramp
30239759ee4 ; Set maintainer for elint.el to emacs-devel
eedd9db6190 Update to Org 9.6.10

# Conflicts:
# lisp/net/tramp-gvfs.el
lisp/emacs-lisp/elint.el diff1 | diff2 | blob | history
lisp/net/tramp-gvfs.el diff1 | diff2 | blob | history
lisp/net/tramp-sh.el diff1 | diff2 | blob | history
lisp/net/tramp-smb.el diff1 | diff2 | blob | history
lisp/net/tramp-sudoedit.el diff1 | diff2 | blob | history
lisp/net/tramp.el diff1 | diff2 | blob | history
lisp/org/org.el diff1 | diff2 | blob | history
test/lisp/net/tramp-tests.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.