]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95227d0 2a08047)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 06:45:50 +0000 (08:45 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 06:45:50 +0000 (08:45 +0200)
1  2 
lisp/progmodes/cc-mode.el patch | diff1 | diff2 | blob | history

diff --cc lisp/progmodes/cc-mode.el
Simple merge