[simspark-cvs] simspark/spark/kerosin/imageserver image.h, 1.2, 1.3 imageserver.h, 1.2, 1.3

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

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

Modified Files:
	image.h imageserver.h 
Log Message:
merge from projectx branch

Index: imageserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/imageserver/imageserver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** imageserver.h	8 Mar 2006 09:18:56 -0000	1.2
--- imageserver.h	17 Jun 2007 13:38:30 -0000	1.3
***************
*** 24,28 ****
  
  #ifdef HAVE_CONFIG_H
! #include <config.h>
  #endif
  #ifdef HAVE_IL_IL_H
--- 24,28 ----
  
  #ifdef HAVE_CONFIG_H
! #include <sparkconfig.h>
  #endif
  #ifdef HAVE_IL_IL_H

Index: image.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/imageserver/image.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** image.h	8 Mar 2006 09:18:56 -0000	1.2
--- image.h	17 Jun 2007 13:38:30 -0000	1.3
***************
*** 33,37 ****
  */
  #ifdef HAVE_CONFIG_H
! #include <config.h>
  #endif
  #ifdef HAVE_IL_IL_H
--- 33,37 ----
  */
  #ifdef HAVE_CONFIG_H
! #include <sparkconfig.h>
  #endif
  #ifdef HAVE_IL_IL_H