Merge branch 'master' of https://github.com/deathkiller/jazz2

deathkiller · Dec 14, 2019 · dbd9668 · dbd9668
2 parents 24cb39c + c965dc6
commit dbd9668
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -148,13 +148,13 @@ publish/
 
 # NuGet Packages
 *.nupkg
-# The packages folder can be ignored because of Package Restore
-#**/packages/*
-**/packages/**/*.xml
+# The Packages folder can be ignored because of Package Restore
+#**/Packages/*
+**/Packages/**/*.xml
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/Packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/Packages/repositories.config
 # NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets

diff --git a/Extensions/Es20Backend/Es20Backend.csproj b/Extensions/Es20Backend/Es20Backend.csproj
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\..\Packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Extensions/GL21Backend/GL21Backend.csproj b/Extensions/GL21Backend/GL21Backend.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\..\Packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Extensions/OpenTKBackend/OpenTKBackend.csproj b/Extensions/OpenTKBackend/OpenTKBackend.csproj
@@ -31,7 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenTK, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
+      <HintPath>..\..\Packages\AdamsLair.OpenTK.1.2.2\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />