code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e427b55 344c6ad)

author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 9 Mar 2015 01:48:35 +0000 (18:48 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 9 Mar 2015 01:48:35 +0000 (18:48 -0700)
commit	8e07ea1a05e801e52061e880aa36b7cec5895f5a
tree	3a5c701604b3193360d3f42ea0c213aae6ad6a4e	tree
parent	e427b55370b28f55e285ce0ee4328246eb7522ea	commit \| diff
parent	344c6adab932fd329c11d76d7a0fff12d250bba2	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
lisp/dired.el	diff1 \|	diff2 \|	blob \| history
nt/ChangeLog	diff1 \|	diff2 \|	blob \| history
nt/INSTALL	diff1 \|	diff2 \|	blob \| history