From 2de5d67c15c377e889e62bb85edc2c4e2a993f81 Mon Sep 17 00:00:00 2001
From: alanh <>
Date: Thu, 16 Nov 2000 19:54:49 +0000
Subject: [PATCH] merge trunk into 64bit branch.

---
 glide3x/cvg/init/sst1init.h | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/glide3x/cvg/init/sst1init.h b/glide3x/cvg/init/sst1init.h
index 99257fd..c8de1f5 100644
--- a/glide3x/cvg/init/sst1init.h
+++ b/glide3x/cvg/init/sst1init.h
@@ -28,20 +28,6 @@
 #define __SST1INIT_H__
 
 /*
-** Copyright (c) 1996, 3Dfx Interactive, Inc.
-** All Rights Reserved.
-**
-** This is UNPUBLISHED PROPRIETARY SOURCE CODE of 3Dfx Interactive, Inc.;
-** the contents of this file may not be disclosed to third parties, copied or
-** duplicated in any form, in whole or in part, without the prior written
-** permission of 3Dfx Interactive, Inc.
-**
-** RESTRICTED RIGHTS LEGEND:
-** Use, duplication or disclosure by the Government is subject to restrictions
-** as set forth in subdivision (c)(1)(ii) of the Rights in Technical Data
-** and Computer Software clause at DFARS 252.227-7013, and/or in similar or
-** successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished  -
-** rights reserved under the Copyright Laws of the United States.
 **
 ** $Revision$
 ** $Date$