Merge from emacs--rel--22

[bpt/emacs.git] / lwlib / ChangeLog

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index b8fc313..fb722be 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,16 @@
+2007-06-13  Chong Yidong  <cyd@stupidchicken.com>
+
+       * lwlib-Xaw.c, lwlib.c: Link to xaw3d if available.
+
+2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Version 22.1 released.
+
+2007-02-28  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (distclean): Delete Makefile.
+       (maintainer-clean): Delete TAGS.
+
 2007-01-01  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xlwmenu.c (xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
@@ -1336,7 +1349,22 @@
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
        2005, 2006, 2007  Free Software Foundation, Inc.
-  Copying and distribution of this file, with or without modification,
-  are permitted provided the copyright notice and this notice are preserved.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: 0cd8ab87-d764-40d9-b86d-d00c71887a9e