]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 020716e bc97a82)
Boring merge from savannah.
authorAlan Mackenzie <acm@muc.de>
Fri, 28 Oct 2011 14:35:39 +0000 (14:35 +0000)
committerAlan Mackenzie <acm@muc.de>
Fri, 28 Oct 2011 14:35:39 +0000 (14:35 +0000)
1  2 
doc/misc/cc-mode.texi patch | diff1 | diff2 | blob | history
lisp/progmodes/cc-engine.el patch | diff1 | diff2 | blob | history
lisp/progmodes/cc-vars.el patch | diff1 | diff2 | blob | history

diff --cc doc/misc/cc-mode.texi
Simple merge
diff --cc lisp/progmodes/cc-engine.el
Simple merge
diff --cc lisp/progmodes/cc-vars.el
Simple merge