| commit | 5842e489eef061766a747e26ca81e1ef6e2ece5a | |
| author | Richard Stallman <rms@gnu.org> | |
| Sun, 5 Apr 2015 12:44:01 +0000 (5 08:44 -0400) | ||
| committer | Richard Stallman <rms@gnu.org> | |
| Sun, 5 Apr 2015 12:44:01 +0000 (5 08:44 -0400) | ||
| tree | a6e85ecc7233dbc1aad578f5532e133447ee78d4 | treesnapshot (tar.gz zip) |
| parent | 4e23cd0ccde4ad1e14fe2870ccf140487af649b2 | commitdiff |
| parent | fdc521952e6d68fa603aac899fe4c08e0a2ed480 | commitdiff |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog
| lisp/ChangeLog | diff1 | diff2 | blobhistory |