]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:48:35 +0000 (18:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:48:35 +0000 (18:48 -0700)
commit8e07ea1a05e801e52061e880aa36b7cec5895f5a
tree3a5c701604b3193360d3f42ea0c213aae6ad6a4e
parente427b55370b28f55e285ce0ee4328246eb7522ea
parent344c6adab932fd329c11d76d7a0fff12d250bba2
Merge from origin/emacs-24

344c6ad Improve MS-Windows build instructions  (Bug#19989)
eb62887 lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

Conflicts:
lisp/ChangeLog
nt/ChangeLog
lisp/ChangeLog
lisp/dired.el
nt/ChangeLog
nt/INSTALL