Merge branch '3.3.1'

shimat · Nov 17, 2017 · 7298306 · 7298306
2 parents b60b570 + 8ff162e
commit 7298306
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/nuget/OpenCvSharp3-AnyCPU.nuspec b/nuget/OpenCvSharp3-AnyCPU.nuspec
@@ -11,7 +11,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>OpenCV wrapper for .NET Framework</description>
         <summary>OpenCV 3.x wrapper</summary>
-        <releaseNotes>- Fixed #331</releaseNotes>
+        <releaseNotes></releaseNotes>
         <copyright>Copyright 2008-2017</copyright>
         <tags>Image Processing OpenCV Wrapper FFI</tags>
         <dependencies>

diff --git a/nuget/OpenCvSharp3-WithoutDll.nuspec b/nuget/OpenCvSharp3-WithoutDll.nuspec
@@ -11,7 +11,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>OpenCV wrapper for .NET Framework</description>
         <summary>OpenCV 3.x wrapper</summary>
-        <releaseNotes>- Fixed #331</releaseNotes>
+        <releaseNotes></releaseNotes>
         <copyright>Copyright 2008-2017</copyright>
         <tags>Image Processing OpenCV Wrapper FFI</tags>
         <dependencies>

diff --git a/samples b/samples
diff --git a/src/OpenCvSharp.ReleaseMaker/MainForm.Designer.cs b/src/OpenCvSharp.ReleaseMaker/MainForm.Designer.cs
diff --git a/src/OpenCvSharp.ReleaseMaker/MainForm.cs b/src/OpenCvSharp.ReleaseMaker/MainForm.cs
@@ -83,6 +83,7 @@ public partial class MainForm : Form
             ".git",
             "bin",
             "obj",
+            ".vs",
         };
 
         /// <summary>
+1 −0		.gitignore
+6 −10		OpenCvSharpSamples.sln
+ −		SampleBase/Data/Image/space_shuttle.jpg
+2,156 −0		SampleBase/Data/Text/bvlc_googlenet.prototxt
+1,000 −0		SampleBase/Data/Text/synset_words.txt
+16 −11		SampleBase/SampleBase.csproj
+1 −1		SampleBase/packages.config
+2 −1		SamplesCS/Program.cs
+91 −0		SamplesCS/Samples/CaffeSample.cs
+8 −11		SamplesCS/SamplesCS.csproj
+1 −1		SamplesCS/app.config
+1 −1		SamplesCS/packages.config
+ −		SamplesCore/Data/Image/space_shuttle.jpg
+2,156 −0		SamplesCore/Data/Text/bvlc_googlenet.prototxt
+1,000 −0		SamplesCore/Data/Text/synset_words.txt
+2 −1		SamplesCore/Program.cs
+91 −0		SamplesCore/Samples/CaffeSample.cs
+42 −0		SamplesCore/SamplesCore.csproj
+0 −21		SamplesCore/SamplesCore.xproj
+0 −23		SamplesCore/project.json
+1 −1		SamplesVB/My Project/Resources.Designer.vb
+2 −2		SamplesVB/My Project/Settings.Designer.vb
+7 −11		SamplesVB/SamplesVB.vbproj
+1 −1		SamplesVB/app.config
+1 −1		SamplesVB/packages.config
+18 −0		nuget.config
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,6 +83,7 @@ public partial class MainForm : Form @@
                 ".git",
                 "bin",
                 "obj",
+                ".vs",
             };
             /// <summary>
@@ Expand Down @@