[simspark-cvs] simspark/spark ChangeLog,1.3,1.4

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21899

Modified Files:
	ChangeLog 
Log Message:
*** empty log message ***

Index: ChangeLog
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog	17 Jun 2007 13:38:29 -0000	1.3
--- ChangeLog	17 Jun 2007 21:54:51 -0000	1.4
***************
*** 1,3 ****
! 2007-06-17  Oliver Obst <fr...@us...>
  
  	* acinclude.m4: 
--- 1,9 ----
! 2007-06-18  Oliver Obst <fr...@us...>
! 
! 	* kerosin/renderserver/renderserver.cpp: 
! 	replaced uint8 by unsigned char
! 	
! 
! 2007-06-17 Oliver Obst <fr...@us...>
  
  	* acinclude.m4: 
***************
*** 98,102 ****
  	* oxygen/simulationserver/netmessage.cpp: 
  	* zeitgeist/leaf.h: 
! 	- merge from HEAD
  
  2007-06-04 Oliver Obst <fr...@us...>
--- 104,108 ----
  	* oxygen/simulationserver/netmessage.cpp: 
  	* zeitgeist/leaf.h: 
! 	- merge: sync projectx branch with HEAD
  
  2007-06-04 Oliver Obst <fr...@us...>