[Stackless-checkins] CVS: slpdev/src/2.2/src/PC config.c,1.6,1.7

[Christian Tismer]

Update of /home/cvs/slpdev/src/2.2/src/PC
In directory centera.de:/tmp/cvs-serv18709/src/PC

Modified Files:
	config.c 
Log Message:
initial patches from diffs (merge) plus a little Visual Studio

Index: config.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/PC/config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.c	30 Apr 2004 22:11:27 -0000	1.6
--- config.c	1 May 2004 01:21:10 -0000	1.7
***************
*** 47,50 ****
--- 47,59 ----
  extern void init_hotshot(void);
  extern void initxxsubtype(void);
+ <<<<<<< ../../2.2/src/./PC/config.c
+ =======
+ extern void initzipimport(void);
+ extern void init_random(void);
+ extern void inititertools(void);
+ #ifdef STACKLESS
+ extern void initstackless(void);
+ #endif
+ >>>>>>> ././PC/config.c
  
  /* XXX tim: what's the purpose of ADDMODULE MARKER? */


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins