diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 15:02:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-04 15:02:09 -0700 |
| commit | 207f11935755236b21ca4d3fe6b19206e0a9ed33 (patch) | |
| tree | d7f5d2ec7b91215f601e085afc64b2176e99b751 /lisp/emacs-lisp/autoload.el | |
| parent | 389698e53a4d3130035e46bf7f8b28480ae9ed8a (diff) | |
| parent | 21d4bf6c449c9ca24f514c82cc0aa2f2ba65f748 (diff) | |
| download | emacs-207f11935755236b21ca4d3fe6b19206e0a9ed33.tar.gz emacs-207f11935755236b21ca4d3fe6b19206e0a9ed33.tar.bz2 emacs-207f11935755236b21ca4d3fe6b19206e0a9ed33.zip | |
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
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
0 files changed, 0 insertions, 0 deletions