]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Thu, 12 Jan 2023 05:30:12 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Thu, 12 Jan 2023 05:30:12 +0000 (06:30 +0100)
commite2abb95b6b03d13e60609ee85ea00bbf44a0bd6b
tree64cbc652e2ab5104fa03205cb584dadf0e10d2ef
parentc51bfef34a6bdefad048444c279ea5b63a6aada1
parentf4f30ff4c44dcfdf780f1981aa541af713f2805f
Merge from origin/emacs-29

f4f30ff4c44 Update to Org 9.6.1
09f7a920644 Add support for annotation_type_declaration
4a8891a462e * etc/NEWS: Mention incompatible changes in 'outline-mino...
384504edf35 Ensure VC package names are not empty
70947da708c Handle missing package description when unpacking vc pack...

# Conflicts:
# etc/NEWS
etc/NEWS.29
lisp/progmodes/java-ts-mode.el