wpdev-commits

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16643/python

Modified Files:
	pyregion.cpp 
Log Message:
Conflict merge fix.

Index: pyregion.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pyregion.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** pyregion.cpp	20 Jul 2004 11:35:38 -0000	1.19
--- pyregion.cpp	20 Jul 2004 11:51:14 -0000	1.20
***************
*** 73,77 ****
  	0,
  	0, // Call
! 	(reprfunc)wpRegion_str
  	0,
  };
--- 73,77 ----
  	0,
  	0, // Call
! 	(reprfunc)wpRegion_str,
  	0,
  };