]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 4 Apr 2015 22:02:09 +0000 (15:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 4 Apr 2015 22:02:09 +0000 (15:02 -0700)
commit207f11935755236b21ca4d3fe6b19206e0a9ed33
treed7f5d2ec7b91215f601e085afc64b2176e99b751
parent389698e53a4d3130035e46bf7f8b28480ae9ed8a
parent21d4bf6c449c9ca24f514c82cc0aa2f2ba65f748
Merge from origin/emacs-24

21d4bf6 * admin/make-tarball.txt: Copyedits.
f3b70a7 ; ChangeLog fix
07432a8 Revert "CC Mode: Stop Font Lock forcing fontification from BOL."

Conflicts:
lisp/ChangeLog
admin/make-tarball.txt
lisp/ChangeLog
lisp/progmodes/cc-mode.el