Skip to content

Commit

Permalink
Merge pull request #3 from sergi4ua/pegasus
Browse files Browse the repository at this point in the history
merge 'pegasus' branch to master
  • Loading branch information
sergi4ua committed Jul 29, 2019
2 parents b0e9780 + 6aafa07 commit d9bd6ec
Show file tree
Hide file tree
Showing 15 changed files with 844 additions and 46 deletions.
22 changes: 22 additions & 0 deletions EQUINE/EQUINE.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -76,6 +77,12 @@
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="frmAbout.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmAbout.Designer.cs">
<DependentUpon>frmAbout.cs</DependentUpon>
</Compile>
<Compile Include="frmCopyDIABDAT.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -163,6 +170,9 @@
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmAbout.resx">
<DependentUpon>frmAbout.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmCopyDIABDAT.resx">
<DependentUpon>frmCopyDIABDAT.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -224,6 +234,18 @@
</ItemGroup>
<ItemGroup>
<Content Include="equine.ico" />
<None Include="Resources\Discord-Logo-Color.png" />
</ItemGroup>
<ItemGroup>
<COMReference Include="IWshRuntimeLibrary">
<Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
131 changes: 111 additions & 20 deletions EQUINE/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d9bd6ec

Please sign in to comment.