# HG changeset patch
# User Jerry James <james@xemacs.org>
# Date 1265215396 25200
# Node ID 5274591ce707764688dee0c30302e85aba0c4ee1
# Parent  c90385e492318e0ff5b2d141af65c8a4c1d44be9
Add copyright and license information for Jonathan Harris's contributions.
See <870180fe1002030842k3c2f851fpeea9f7a361768e01@mail.gmail.com> in
xemacs-patches for more information.

diff -r c90385e49231 -r 5274591ce707 nt/ChangeLog
--- a/nt/ChangeLog	Wed Feb 03 09:17:33 2010 -0700
+++ b/nt/ChangeLog	Wed Feb 03 09:43:16 2010 -0700
@@ -1,3 +1,9 @@
+2010-02-03  Jerry James  <james@xemacs.org>
+
+	* xemacs.rc: Add license and copyright boilerplate text for Jonathan
+	Harris.
+	* xpm.mak: Ditto.
+
 2010-01-28  Jerry James  <james@xemacs.org>
 
 	* compface.mak: Add license and copyright boilerplate text based
diff -r c90385e49231 -r 5274591ce707 nt/ad2c.sed
--- a/nt/ad2c.sed	Wed Feb 03 09:17:33 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-/^!/d
-/^$/d
-s/\\/\\\\/g
-s/\\$//g
-s/"/\\"/g
-s/^/(String) "/
-: test
-/\\$/b slash
-s/$/",/
-p
-d
-: slash
-n
-/^!/d
-/^$/d
-s/"/\\"/g
-s/\\\\/\\/g
-s/\\n/\\\\n/g
-s/\\t/\\\\t/g
-s/\\f/\\\\f/g
-s/\\b/\\\\b/g
-b test
diff -r c90385e49231 -r 5274591ce707 nt/x11.patch
--- a/nt/x11.patch	Wed Feb 03 09:17:33 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-*** X11.def.old	Thu Apr 10 07:29:27 1997
---- X11.def	Wed Jul 02 22:20:16 1997
-***************
-*** 5,15 ****
-  VERSION 6.1
-  EXPORTS
-   _Xdebug_p=_Xdebug CONSTANT
--  _XCreateMutex_fn_p=_XCreateMutex_fn CONSTANT
--  _XFreeMutex_fn_p=_XFreeMutex_fn CONSTANT
--  _XLockMutex_fn_p=_XLockMutex_fn CONSTANT
--  _XUnlockMutex_fn_p=_XUnlockMutex_fn CONSTANT
--  _Xglobal_lock_p=_Xglobal_lock CONSTANT
-   XActivateScreenSaver
-   XAddConnectionWatch
-   XAddExtension
---- 5,10 ----
-***************
-*** 623,630 ****
-   _XUnregisterFilter
-   _XUnregisterInternalConnection
-   _XVIDtoVisual
--  _Xthread_init
--  _Xthread_waiter
-   XkbIgnoreExtension
-   XkbOpenDisplay
-   XkbQueryExtension
---- 618,623 ----
diff -r c90385e49231 -r 5274591ce707 nt/xemacs.mak
--- a/nt/xemacs.mak	Wed Feb 03 09:17:33 2010 -0700
+++ b/nt/xemacs.mak	Wed Feb 03 09:43:16 2010 -0700
@@ -1033,9 +1033,6 @@
 	set COPYCMD=$(COPYCMD)
 	@copy $(SRC)\config.h.in $(SRC)\config.h
 
-#$(SRC)\Emacs.ad.h: $(SRCROOT)\etc\Emacs.ad
-#	!"sed -f ad2c.sed < $(SRCROOT)\etc\Emacs.ad > $(SRC)\Emacs.ad.h"
-
 #$(SRC)\paths.h: $(SRC)\paths.h.in
 #	!"cd $(SRC); cp paths.h.in paths.h"
 
diff -r c90385e49231 -r 5274591ce707 nt/xemacs.rc
--- a/nt/xemacs.rc	Wed Feb 03 09:17:33 2010 -0700
+++ b/nt/xemacs.rc	Wed Feb 03 09:43:16 2010 -0700
@@ -1,3 +1,22 @@
+/* Copyright (C) 1997 Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs 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.
+
+XEmacs 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 XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin St. - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
 #ifdef INCLUDE_DUMP
 101    DUMP      "xemacs.dmp"
 #endif
diff -r c90385e49231 -r 5274591ce707 nt/xpm.mak
--- a/nt/xpm.mak	Wed Feb 03 09:17:33 2010 -0700
+++ b/nt/xpm.mak	Wed Feb 03 09:43:16 2010 -0700
@@ -1,6 +1,25 @@
 #
 # XPM Makefile for Microsoft NMAKE without X libraries
 #
+# Copyright (C) 1997 Free Software Foundation, Inc.
+#
+# This file is part of XEmacs.
+#
+# XEmacs 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.
+#
+# XEmacs 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 XEmacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin St. - Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
 !if !defined(DEBUG)
 !if defined(DEBUG_XEMACS)
 DEBUG=$(DEBUG_XEMACS)