Browse Source

merge conflict libraries directory

Frans van Daalen 5 years ago
parent
commit
95b8fec20f
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/gui-classic/UFRMOperation.pas
  2. 1 1
      src/pascalcoin_wallet_classic.lpi

+ 1 - 1
src/gui-classic/UFRMOperation.pas

@@ -530,7 +530,7 @@ end;
 
 
 procedure TFRMOperation.FormCreate(Sender: TObject);
 procedure TFRMOperation.FormCreate(Sender: TObject);
 begin
 begin
-  Transaltecomponent(self);
+  Translatecomponent(self);
   FDisabled := false;
   FDisabled := false;
   FWalletKeys := Nil;
   FWalletKeys := Nil;
   FSenderAccounts := TOrderedCardinalList.Create;
   FSenderAccounts := TOrderedCardinalList.Create;

+ 1 - 1
src/pascalcoin_wallet_classic.lpi

@@ -239,7 +239,7 @@
     </Target>
     </Target>
     <SearchPaths>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="core;gui-classic;libraries\synapse;libraries\sphere10;libraries\cryptolib4pascal;libraries\simplebaselib4pascal;libraries\hashlib4pascal;libraries\generics.collections;libraries\pascalcoin;libraries\paszlib;libraries\gnugettext"/>
+      <OtherUnitFiles Value="core;gui-classic;libraries\synapse;libraries\sphere10;libraries\cryptolib4pascal;libraries\simplebaselib4pascal;libraries\hashlib4pascal;libraries\generics.collections;libraries\pascalcoin;libraries\paszlib;libraries\gnugettext;libraries\abstractmem"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     </SearchPaths>
     <Parsing>
     <Parsing>