CVS update: Vanilla

[Vanilla CVS Development <vanilla-devel@us.netrek.org>]

Date:	Wednesday July 14, 1999 @ 3:43
Author:	tanner

Update of /home/netrek/cvsroot/Vanilla
In directory cvs.castle.real-time.com:/var/tmp/cvs-serv12055

Modified Files:
	ChangeLog 
Log Message:
Stupid typos and I forgot to add the changelog info to the .spec file.



****************************************

Index: Vanilla/ChangeLog
diff -u Vanilla/ChangeLog:1.15 Vanilla/ChangeLog:1.16
--- Vanilla/ChangeLog:1.15	Wed Jul 14 03:39:53 1999
+++ Vanilla/ChangeLog	Wed Jul 14 03:43:45 1999
@@ -7,13 +7,11 @@
 	* rpm/cvs2rpm: Added a shell script to take the files out of cvs
 	and copy them into the Redhat RPM hierarchy.
 
-<<<<<<< ChangeLog
 1999-07-13  Bob Tanner  <tanner@real-time.com>
 
 	* rpm/Vanilla.spec (Group): Added the %changelog section to the
 	spec file.
 
-=======
 Tue Jul 13 20:39:46 1999  Bob Tanner  <tanner@real-time.com>
 
 	* robots/robotII.c (main):  remove warning of return type on main.
@@ -22,7 +20,6 @@
 
 	* tools/update.c: removed redefination warning.
 
->>>>>>> 1.14
 1999-07-13  Bob Tanner  <tanner@real-time.com>
 
 	* tools/ltd_dump.c (warning): removed warning of return type.
@@ -327,4 +324,4 @@
  	update_sys_defaults in updateMessages to a more appropriate
  	location - updateClient in socket.c.
 	
-	$Id: ChangeLog,v 1.15 1999/07/14 08:39:53 tanner Exp $
+	$Id: ChangeLog,v 1.16 1999/07/14 08:43:45 tanner Exp $