Merge branch 'master' of manuel-voegele.de:inf3
Conflicts: src/Parser.cs
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>10.0.0</ProductVersion>
|
||||
<ProductVersion>8.0.30703</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{FB0656B5-8E83-4880-9EAE-55E474B8B732}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
@@ -118,6 +118,7 @@
|
||||
</Compile>
|
||||
<Compile Include="src\BinarySearch.cs" />
|
||||
<Compile Include="src\Sorttest.cs" />
|
||||
<Compile Include="src\AI.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
|
||||
@@ -142,4 +143,4 @@
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
</Project>
|
||||
</Project>
|
||||
|
||||
Reference in New Issue
Block a user