--- Merging r43572 into '.':

A    .gitignore
--- Recording mergeinfo for merge of r43572 into '.':
 U   .
--- Merging r43581 into '.':
U    .gitignore
--- Recording mergeinfo for merge of r43581 into '.':
 G   .
--- Merging r43582 into '.':
G    .gitignore
--- Recording mergeinfo for merge of r43582 into '.':
 G   .
--- Merging r43916 into '.':
A    packages/ide/fpx64.lpi
--- Recording mergeinfo for merge of r43916 into '.':
 G   .

# revisions: 43572,43581,43582,43916

git-svn-id: branches/fixes_3_2@43956 -

.gitattributes

@@ -4953,6 +4953,7 @@ packages/ide/fputils.pas svneol=native#text/plain
 packages/ide/fpvars.pas svneol=native#text/plain
 packages/ide/fpviews.pas svneol=native#text/plain
 packages/ide/fpw32.rc -text
+packages/ide/fpx64.lpi svneol=native#text/plain
 packages/ide/gdbmicon.pas svneol=native#text/plain
 packages/ide/gdbmiint.pas svneol=native#text/plain
 packages/ide/gdbmiproc.pas svneol=native#text/plain

packages/ide/fpx64.lpi

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <ProjectOptions>
+    <Version Value="12"/>
+    <General>
+      <Flags>
+        <MainUnitHasCreateFormStatements Value="False"/>
+        <MainUnitHasTitleStatement Value="False"/>
+        <MainUnitHasScaledStatement Value="False"/>
+      </Flags>
+      <SessionStorage Value="InProjectDir"/>
+      <Title Value="fp"/>
+      <UseAppBundle Value="False"/>
+      <ResourceType Value="res"/>
+    </General>
+    <BuildModes>
+      <Item Name="Default" Default="True"/>
+    </BuildModes>
+    <PublishOptions>
+      <Version Value="2"/>
+      <UseFileFilters Value="True"/>
+    </PublishOptions>
+    <RunParams>
+      <FormatVersion Value="2"/>
+      <Modes Count="0"/>
+    </RunParams>
+    <Units>
+      <Unit>
+        <Filename Value="fp.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="FP"/>
+      </Unit>
+    </Units>
+  </ProjectOptions>
+  <CompilerOptions>
+    <Version Value="11"/>
+    <Target>
+      <Filename Value="fp"/>
+    </Target>
+    <SearchPaths>
+      <IncludeFiles Value="$(ProjOutDir);../../compiler;../../compiler/x86_64"/>
+      <OtherUnitFiles Value="../../compiler;../../compiler/x86;../../compiler/x86_64;../../compiler/systems;../rtl-extra/src/inc;../fv/src"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+    </SearchPaths>
+    <Parsing>
+      <SyntaxOptions>
+        <SyntaxMode Value="fpc"/>
+        <UseAnsiStrings Value="False"/>
+      </SyntaxOptions>
+    </Parsing>
+    <Other>
+      <CustomOptions Value="-dx86_64
+-dnodebug"/>
+    </Other>
+  </CompilerOptions>
+  <Debugging>
+    <Exceptions Count="1">
+      <Item1>
+        <Name Value="ECompilerAbort"/>
+      </Item1>
+    </Exceptions>
+  </Debugging>
+</CONFIG>