diff options
Diffstat (limited to 'ChangeLog.2')
| -rw-r--r-- | ChangeLog.2 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index 6d72663d565..6a8f539da46 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -3180,14 +3180,6 @@ * lisp/net/tramp-compat.el (tramp-compat-delete-dups): New defun. * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Use it. -2015-10-28 Anders Lindgren <andlind@gmail.com> - - Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh - - Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs - - Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh - 2015-10-28 Michael Albinus <michael.albinus@gmx.de> * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): @@ -3207,10 +3199,6 @@ * nsterm.m (ns_constrain_all_frames, ns_init_term): Block input. * nsterm.m (ns_send_appdefined, EmacsApp): Trace output. -2015-10-28 Anders Lindgren <andlind@gmail.com> - - Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs - 2015-10-28 Artur Malabarba <bruce.connor.am@gmail.com> * src/process.c (Fget_buffer_process): Improve docstring. |