修改冲突2

Controls/RealICQComponents.dof

@@ -1,136 +0,0 @@
-[FileVersion]
-Version=7.0
-[Compiler]
-A=8
-B=0
-C=1
-D=1
-E=0
-F=0
-G=1
-H=1
-I=1
-J=0
-K=0
-L=1
-M=0
-N=1
-O=1
-P=1
-Q=0
-R=0
-S=0
-T=0
-U=0
-V=1
-W=0
-X=1
-Y=1
-Z=1
-ShowHints=1
-ShowWarnings=1
-UnitAliases=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-NamespacePrefix=
-SymbolDeprecated=1
-SymbolLibrary=1
-SymbolPlatform=1
-UnitLibrary=1
-UnitPlatform=1
-UnitDeprecated=1
-HResultCompat=1
-HidingMember=1
-HiddenVirtual=1
-Garbage=1
-BoundsError=1
-ZeroNilCompat=1
-StringConstTruncated=1
-ForLoopVarVarPar=1
-TypedConstVarPar=1
-AsgToTypedConst=1
-CaseLabelRange=1
-ForVariable=1
-ConstructingAbstract=1
-ComparisonFalse=1
-ComparisonTrue=1
-ComparingSignedUnsigned=1
-CombiningSignedUnsigned=1
-UnsupportedConstruct=1
-FileOpen=1
-FileOpenUnitSrc=1
-BadGlobalSymbol=1
-DuplicateConstructorDestructor=1
-InvalidDirective=1
-PackageNoLink=1
-PackageThreadVar=1
-ImplicitImport=1
-HPPEMITIgnored=1
-NoRetVal=1
-UseBeforeDef=1
-ForLoopVarUndef=1
-UnitNameMismatch=1
-NoCFGFileFound=1
-MessageDirective=1
-ImplicitVariants=1
-UnicodeToLocale=1
-LocaleToUnicode=1
-ImagebaseMultiple=1
-SuspiciousTypecast=1
-PrivatePropAccessor=1
-UnsafeType=0
-UnsafeCode=0
-UnsafeCast=0
-[Linker]
-MapFile=0
-OutputObjs=0
-ConsoleApp=1
-DebugInfo=0
-RemoteSymbols=0
-MinStackSize=16384
-MaxStackSize=1048576
-ImageBase=4194304
-ExeDescription=
-[Directories]
-OutputDir=
-UnitOutputDir=
-PackageDLLOutputDir=E:\RealICQ Projects For Win32\Controls
-PackageDCPOutputDir=
-SearchPath=
-Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOffice2k
-Conditionals=
-DebugSourceDirs=
-UsePackages=0
-[Parameters]
-RunParams=
-HostApplication=
-Launcher=
-UseLauncher=0
-DebugCWD=
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=D:\Program Files\Borland\Delphi7\Bin\
-[Version Info]
-IncludeVerInfo=1
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=2052
-CodePage=936
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=

RealICQ Projects For Win32.groupproj

@@ -181,13 +181,22 @@
   <Target Name="AppCentreCom:Make">
     <MSBuild Projects="AppCom\AppCentreCom.dproj" Targets="Make" />
   </Target>
+  <Target Name="RealICQComponents">
+    <MSBuild Projects="Controls\RealICQComponents.dproj" Targets="" />
+  </Target>
+  <Target Name="RealICQComponents:Clean">
+    <MSBuild Projects="Controls\RealICQComponents.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="RealICQComponents:Make">
+    <MSBuild Projects="Controls\RealICQComponents.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Lxtalk;DCEF_D7;CnPack_D2007;dclCnPack_D2007;DSPack_D2005;DirectX9_D2005;DSPackDesign_D2005;dclIndyCore90;IndyCore90;dclIndyProtocols90;IndyProtocols90;IndySystem90;Logger;LoggerTest;CSAuthDemo;GroupClientCase;AppCentrelib;CA;AppCentreCom" />
+    <CallTarget Targets="Lxtalk;DCEF_D7;CnPack_D2007;dclCnPack_D2007;DSPack_D2005;DirectX9_D2005;DSPackDesign_D2005;dclIndyCore90;IndyCore90;dclIndyProtocols90;IndyProtocols90;IndySystem90;Logger;LoggerTest;CSAuthDemo;GroupClientCase;AppCentrelib;CA;AppCentreCom;RealICQComponents" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Lxtalk:Clean;DCEF_D7:Clean;CnPack_D2007:Clean;dclCnPack_D2007:Clean;DSPack_D2005:Clean;DirectX9_D2005:Clean;DSPackDesign_D2005:Clean;dclIndyCore90:Clean;IndyCore90:Clean;dclIndyProtocols90:Clean;IndyProtocols90:Clean;IndySystem90:Clean;Logger:Clean;LoggerTest:Clean;CSAuthDemo:Clean;GroupClientCase:Clean;AppCentrelib:Clean;CA:Clean;AppCentreCom:Clean" />
+    <CallTarget Targets="Lxtalk:Clean;DCEF_D7:Clean;CnPack_D2007:Clean;dclCnPack_D2007:Clean;DSPack_D2005:Clean;DirectX9_D2005:Clean;DSPackDesign_D2005:Clean;dclIndyCore90:Clean;IndyCore90:Clean;dclIndyProtocols90:Clean;IndyProtocols90:Clean;IndySystem90:Clean;Logger:Clean;LoggerTest:Clean;CSAuthDemo:Clean;GroupClientCase:Clean;AppCentrelib:Clean;CA:Clean;AppCentreCom:Clean;RealICQComponents:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Lxtalk:Make;DCEF_D7:Make;CnPack_D2007:Make;dclCnPack_D2007:Make;DSPack_D2005:Make;DirectX9_D2005:Make;DSPackDesign_D2005:Make;dclIndyCore90:Make;IndyCore90:Make;dclIndyProtocols90:Make;IndyProtocols90:Make;IndySystem90:Make;Logger:Make;LoggerTest:Make;CSAuthDemo:Make;GroupClientCase:Make;AppCentrelib:Make;CA:Make;AppCentreCom:Make" />
+    <CallTarget Targets="Lxtalk:Make;DCEF_D7:Make;CnPack_D2007:Make;dclCnPack_D2007:Make;DSPack_D2005:Make;DirectX9_D2005:Make;DSPackDesign_D2005:Make;dclIndyCore90:Make;IndyCore90:Make;dclIndyProtocols90:Make;IndyProtocols90:Make;IndySystem90:Make;Logger:Make;LoggerTest:Make;CSAuthDemo:Make;GroupClientCase:Make;AppCentrelib:Make;CA:Make;AppCentreCom:Make;RealICQComponents:Make" />
   </Target>
 </Project>