[GME-commit] GMESRC/Tools/GMEMerge Merge.h,1.2,1.3

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/Tools/GMEMerge
In directory escher:/tmp/cvs-serv12574

Modified Files:
	Merge.h 
Log Message:
no message

CVS User: Gyorgy Balogh, ISIS (bogyom)

Index: Merge.h
===================================================================
RCS file: /project/gme-repository/GMESRC/Tools/GMEMerge/Merge.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Merge.h	15 Aug 2006 21:56:26 -0000	1.2
--- Merge.h	22 Sep 2006 19:36:28 -0000	1.3
***************
*** 80,83 ****
--- 80,86 ----
  
  protected:
+ 
+ 	void test1();
+ 
  	void checkParadigms();
  
***************
*** 99,102 ****
--- 102,107 ----
  
  	void restoreSets();
+ 
+ 	bool shouldFollowLink( CComPtr<IMgaFCO> fco );
  
  	void mergeFolders( CComPtr<IMgaFolder> act, CComPtr<IMgaFolder> mergein );