projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c93009 ef5f3d5)
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 28 Jun 2021 14:50:45 +0000 (07:50 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 28 Jun 2021 14:50:45 +0000 (07:50 -0700)
ef5f3d5ee7 (origin/emacs-27) C++ Mode: Handle new keywords static_cas...

1  2 
lisp/progmodes/cc-engine.el patch | diff1 | diff2 | blob | history
lisp/progmodes/cc-langs.el patch | diff1 | diff2 | blob | history

diff --cc lisp/progmodes/cc-engine.el
Simple merge
diff --cc lisp/progmodes/cc-langs.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.