Subversion Repositories spk

Rev

Rev 56 | Rev 65 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 56 Rev 58
Line 245... Line 245...
245 
 
 245 
 
246 
	void SetCurrentDir(CyString dir) { m_sCurrentDir = dir; }
 246 
	void SetCurrentDir(CyString dir) { m_sCurrentDir = dir; }
247 
 
 247 
 
248 
	// merge mods
 248 
	// merge mods
249 
	CyStringList *GetMergedFiles(CCatFile *cat1, CCatFile *cat2);
 249 
	CyStringList *GetMergedFiles(CCatFile *cat1, CCatFile *cat2);
250 
	bool CanWeMerge(CyString file);
 250 
	bool CanWeMerge(const Utils::String &file) const;
251 
	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
 251 
	bool MergeMods(CCatFile *mod1, CCatFile *mod2, CyString outFile, CyStringList *cantMerge);
252 
	bool NeedToMerge(CyString file);
 252 
	bool NeedToMerge(CyString file);
253 
	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
 253 
	CyStringList MergeTextFiles(CyStringList *files, CCatFile *mod1, CCatFile *mod2);
254 
	bool GetModCompatabilityList(C_File *file, CyStringList *list = NULL);
 254 
	bool GetModCompatabilityList(C_File *file, CyStringList *list = NULL);
255 
	bool CheckCompatabilityBetweenModFiles(C_File *from, C_File *to, CyStringList *list = NULL);
 255 
	bool CheckCompatabilityBetweenModFiles(C_File *from, C_File *to, CyStringList *list = NULL);