summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-12-05 15:12:00 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2014-12-05 15:12:00 -0500
commit0c3f76c6335de0a2d44db37c9ddf953654ca7f32 (patch)
tree69f9f5c2df0eaefaa0b97dcd3df1d01a7ee28a9b /lisp/emacs-lisp
parent0bb24df135e9c44d2e5a78b58b10719eea9e413b (diff)
parentbabb0ca80be9a46eee70f23377f360e927797ae2 (diff)
downloademacs-0c3f76c6335de0a2d44db37c9ddf953654ca7f32.tar.gz
emacs-0c3f76c6335de0a2d44db37c9ddf953654ca7f32.tar.bz2
emacs-0c3f76c6335de0a2d44db37c9ddf953654ca7f32.zip
Merge from origin/emacs-24
The following commit was skipped: babb0ca ChangeLog fix (do not merge to master)
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions