head	1.2;
access;
symbols
	autoconf-20031203:1.1
	autoconf-20031202:1.1
	phong-branch:1.1.0.4
	photonmap-branch:1.1.0.2
	AUTOCONF:1.1.0.6;
locks; strict;
comment	@# @;


1.2
date	2004.02.02.17.59.26;	author morrison;	state dead;
branches;
next	1.1;

1.1
date	2003.08.08.14.45.42;	author morrison;	state Exp;
branches
	1.1.2.1
	1.1.6.1;
next	;

1.1.2.1
date	2003.08.26.14.02.55;	author justin;	state Exp;
branches;
next	;

1.1.6.1
date	2004.02.12.19.40.39;	author erikg;	state dead;
branches;
next	;


desc
@@


1.2
log
@do what others do, consolidate the copyright files into a single COPYRIGHT file
@
text
@Re-distribution of this software is restricted, as described in your
"Statement of Terms and Conditions for the Release of The BRL-CAD
Package" agreement.

Portions of this software and the associated databases and images are
Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1994, 1995, 2000, 2001,
2002, 2003 by the United States Army in all countries except the USA. 
Unauthorized redistribution in any form is prohibited. Recipients of this
distribution are authorized unlimited use within their corporation,
organization, or agency.

The mark "BRL-CAD" is a Registered Trademark of the United States Army.
All rights reserved.

There is no warranty or other guarantee of fitness for this software,
it is provided solely "as is".  Bug reports or fixes must be sent
to ARL, which may or may not act on them.

This software was developed by and is proprietary to the United States
Government, and any use of the software without the written permission
of the US Army Research Laboratory is strictly prohibited. Any
unauthorized use of the software will be construed as an infringement of
the Government's rights and will subject the unauthorized user to
action(s) for infringement damages. (BRL MFR 380-15, Feb-88)

The software in the "contributed" directory is Public Domain, Distribution
Unlimited.  In addition, certain other modules in the BRL-CAD package
bear this designation.  Files so marked are available for unlimited use.
@


1.1
log
@2003 copyright finally added..
@
text
@@


1.1.6.1
log
@merge from HEAD
@
text
@@


1.1.2.1
log
@updated for merging
@
text
@@

