projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d44d08 588a036)
Merge remote-tracking branch 'origin/master' into feature/android
authorPo Lu <luangruo@yahoo.com>
Thu, 3 Aug 2023 11:50:23 +0000 (19:50 +0800)
committerPo Lu <luangruo@yahoo.com>
Thu, 3 Aug 2023 11:50:23 +0000 (19:50 +0800)
1  2 
lisp/faces.el patch | diff1 | diff2 | blob | history
lisp/menu-bar.el patch | diff1 | diff2 | blob | history
lisp/net/tramp.el patch | diff1 | diff2 | blob | history
lisp/progmodes/cperl-mode.el patch | diff1 | diff2 | blob | history

diff --cc lisp/faces.el
Simple merge
diff --cc lisp/menu-bar.el
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc lisp/progmodes/cperl-mode.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.