# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265392437 21600
# Node ID fbcf988fbb33283f99f303f60a8591ae28dd439c
# Parent  3c3c1d13986399a202ee07cddfccb9fb9709f34c# Parent  931aaa7a6b37f16c0c0429a12ce9bc10cbf4e44c
Automatic merge

diff -r 3c3c1d139863 -r fbcf988fbb33 tests/ChangeLog
--- a/tests/ChangeLog	Fri Feb 05 11:25:00 2010 -0600
+++ b/tests/ChangeLog	Fri Feb 05 11:53:57 2010 -0600
@@ -1,3 +1,7 @@
+2010-02-05  Jerry James  <james@xemacs.org>
+
+	* frame.el: Martin Buchholz claims ownership.
+
 2010-01-25  Ben Wing  <ben@xemacs.org>
 
 	* automated/file-tests.el:
diff -r 3c3c1d139863 -r fbcf988fbb33 tests/frame.el
--- a/tests/frame.el	Fri Feb 05 11:25:00 2010 -0600
+++ b/tests/frame.el	Fri Feb 05 11:53:57 2010 -0600
@@ -1,4 +1,24 @@
-;;; Test geometry settings for frames
+;;; Test geometry setting for frames.
+;;;
+;;; Copyright (C) 1997 Martin Buchholz
+;;;
+;;; 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 Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
+
 (defmacro check-frame-geometry (xx yy)
   `(loop for frame in (list nil (selected-frame))
 	 do
@@ -24,4 +44,3 @@
 	    (check-frame-geometry x (+ y 3))
 	    (set-frame-property frame 'left (+ x 3))
 	    (check-frame-geometry (+ x 3) (+ y 3))))
-