diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-08 18:49:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-08 18:49:27 -0700 |
| commit | 59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d (patch) | |
| tree | 14f76279dfbe805aefb1f11b8b23ea6d9aa192f0 /lisp/emacs-lisp/warnings.el | |
| parent | 0dfe7002a6b6f330b981e2d40f372bf71eeac1df (diff) | |
| parent | 113fcc3b739d6a024e41a5727aeddca7aaf1cb81 (diff) | |
| download | emacs-59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d.tar.gz emacs-59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d.tar.bz2 emacs-59c414b1d0a01acff2bdc5e8ee6b76b0ee5aac3d.zip | |
Merge from origin/emacs-24
113fcc3 * etc/AUTHORS: Update the AUTHORS file
51c0c8d * lisp/ChangeLog: Fix a changelog entry
Conflicts:
etc/AUTHORS
Diffstat (limited to 'lisp/emacs-lisp/warnings.el')
0 files changed, 0 insertions, 0 deletions