; * etc/NEWS: xwidgets isn't documented.

[gnu-emacs] / ChangeLog.2

diff --git a/ChangeLog.2 b/ChangeLog.2
index 3636e382eb207ac7dffd7e2aa0a037a17bc20d13..7a63a9538d1867c0d5f1ef687524b0282a15564d 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -785,14 +785,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):
@@ -812,10 +804,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.
@@ -1764,7 +1752,7 @@
 
 2015-10-23  Anders Lindgren  <andlind@gmail.com>
 
-       NextSten maximization and NSTRACE rewrite
+       NextStep maximization and NSTRACE rewrite
 
        Full-height, full-width, and maximized windows now cover the
        entire screen (except the menu bar), including the part where the
@@ -13915,10 +13903,10 @@
 2015-05-21  kwhite  <kwhite@gnu.org>
 
        * lisp/erc/erc.el: Hide network/channel messages.
-       (erc-network-hide-list, etc-channel-hide-list): New lists to define
+       (erc-network-hide-list, erc-channel-hide-list): New lists to define
        message types per network/channel.
        (erc-add-targets): New function to parse list of targets.
-       (erc-hide-current-message-p): Modified to check for new targets.
+       (erc-hide-current-message-p): Modify to check for new targets.
 
 2015-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -17974,7 +17962,7 @@ See ChangeLog.1 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2015 Free Software Foundation, Inc.
+  Copyright (C) 2015-2016 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.