| commit | fca389d1d3253c58e198efaa28d175106ce5022a | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Fri, 5 Dec 2014 20:20:02 +0000 (5 15:20 -0500) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Fri, 5 Dec 2014 20:20:02 +0000 (5 15:20 -0500) | ||
| tree | ee26e3194caf1e854c2f5844aa772ae4bafaa314 | treesnapshot (tar.gz zip) |
| parent | 0c3f76c6335de0a2d44db37c9ddf953654ca7f32 | commitdiff |
| parent | e97b6e6f11ceb85f4f3cbe1ecbbc46aa0a8de48a | commitdiff |
Merge from emacs-24
| admin/gitmerge.el | diff1 | blobhistory | |
| lisp/ChangeLog | diff1 | diff2 | blobhistory |
| lisp/progmodes/prog-mode.el | diff1 | diff2 | blobhistory |
| lisp/simple.el | diff1 | diff2 | blobhistory |