]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 29 Jan 2015 21:54:51 +0000 (13:54 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 29 Jan 2015 21:54:51 +0000 (13:54 -0800)
commiteadf313c72edcc3a11b9d03032699416efebfe1a
tree81469c8442f140d2fdc6896e17b15cf3761e1663
parent7c8b0b3644ada886dfde4032fdf38687a5968089
parentad588afdaa166bcdacbf9f746bd4d39b2c649768
Merge from origin/emacs-24

ad588af Improve the fix for bug #19701

Conflicts:
src/ChangeLog
src/ChangeLog
src/dired.c
src/w32.c