Update copyright year to 2015

[gnu-emacs] / oldXMenu / ChangeLog

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 6c0db12e78c17ba77beb16410a541f83ef526dc3..d6a824ba46705cc38cb6a52cd28b27b145866346 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to 24.4 release.
+
 2014-09-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Less chatter in 'make' output.
@@ -94,8 +98,8 @@
        (MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused.
        (x_get_resource_string): Args are readonly.
        (XAllocDisplayColor): colorName is readonly.
-       (XMenuCreate): def_env is readonly.  Remove unused locals.  Avoid
-       "else;".
+       (XMenuCreate): def_env is readonly.  Remove unused locals.
+       Avoid "else;".
        * Destroy.c (XMenuDestroy): Return void.
        * Error.c (XMenuError): Remove const pointer.
        * EvHand.c (XMenuEventHandler): Return void.
@@ -350,7 +354,7 @@
 
 1995-02-07  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
 
-       * Makefile.in (maintainer-clean): Renamed from realclean.
+       * Makefile.in (maintainer-clean): Rename from realclean.
 
 1994-10-25  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
@@ -430,8 +434,8 @@
 
 1993-09-27  Brian J. Fox  (bfox@valhalla)
 
-       * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS): Allow
-       `configure' to supply the values for these variables.
+       * Makefile.in (CPP, LN_S, C_SWITCH_X_SITE, CC, CFLAGS):
+       Allow `configure' to supply the values for these variables.
 
 1993-09-26  Brian J. Fox  (bfox@ai.mit.edu)
 
@@ -636,7 +640,7 @@
 
        * XDelAssoc.c, XLookAssoc.c, XCrAssoc.c, XDestAssoc.c, XMakeAssoc.c:
        Use Xlib.h, not Xlibint.h.
-       * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Defined.
+       * XLookAssoc.c, XMakeAssoc.c, XCrAssoc.c (NULL): Define.
        * XMakeAssoc.c, XCrAssoc.c: Include errno.h.  Declare errno.
        * XMakeAssoc.c (_XIOErrorFunction): Declared.
 
@@ -701,7 +705,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2014 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.