Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Browse Source

Conflicts:
	lisp/net/tramp.el

...

This commit is contained in:

Michael Albinus

2015-05-27 18:49:29 +02:00

parent 570edf2573 b0f3a49593

commit f9fabb2bb0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available