Apple-2gs-SW
/
Merlin32Language
mirror of https://github.com/OlivierGuinart/Merlin32Language.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge master

This commit is contained in:
Brian Peek 2017-09-26 12:38:34 -04:00
parent fb12dd2953 00d040f247
commit 9d646f5004
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Merlin32Language.csproj
View File

@ -82,7 +82,10 @@
<Reference Include="Microsoft.VisualStudio.Language.Intellisense">
<Private>False</Private>
</Reference>
<<<<<<< HEAD
<Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
=======
>>>>>>> master
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
<Private>True</Private>