|
From: <du...@us...> - 2007-03-18 11:14:46
|
Revision: 196
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=196&view=rev
Author: dukus
Date: 2007-03-18 03:30:53 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
SVN Conflict resolved
Modified Paths:
--------------
trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs
trunk/plugins/mpinstaler/MPInstaler.suo
Modified: trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs
===================================================================
--- trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-17 13:53:17 UTC (rev 195)
+++ trunk/plugins/mpinstaler/MPInstaler/MPpackageStruct.cs 2007-03-18 10:30:53 UTC (rev 196)
@@ -98,7 +98,6 @@
if (Path.GetFileName(ze.Name) == Path.GetFileName(fl.FileName)
&& ze.Name.Contains(@"\"+fl.SubType+@"\"))
{
-// MessageBox.Show(ze.Name);
return true;
}
else return false;
Modified: trunk/plugins/mpinstaler/MPInstaler.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|