projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0479a1b 8478885)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 Mar 2015 21:14:37 +0000 (14:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 Mar 2015 21:14:37 +0000 (14:14 -0700)
The following commits were skipped:

8478885 Bump version to 24.5 for the release-candidate
118b6a9 (url-insert-file-contents): Set buffer-file-coding-system


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.