Merge branch 'release/1.1.3'

lparam · Jun 9, 2015 · 0aa43c2 · 0aa43c2
2 parents af80cda + 62b7372
commit 0aa43c2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v1.1.3 (2015-6-09)
+-----------
+* CHANGE: Build native xsocks with WinDDK
+
+
 v1.1.2 (2015-6-07)
 -----------
 * The first public version.
diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ with any editor, Xsocks will notify browsers about the change automatically
 6. You can also update the PAC file from GFWList. Note your modifications to the PAC
 file will be lost. However you can put your rules in the user rule file for GFWList.
 Don't forget to update from GFWList again after you've edited the user rule
-7. Your system may need [Visual C++ Redistributable Packages](https://www.microsoft.com/en-US/download/details.aspx?id=40784)
 
 ### Develop
 

diff --git a/Xsocks/Properties/AssemblyInfo.cs b/Xsocks/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.2")]
-[assembly: AssemblyFileVersion("1.1.2")]
+[assembly: AssemblyVersion("1.1.3")]
+[assembly: AssemblyFileVersion("1.1.3")]
diff --git a/Xsocks/Resources/pac.txt.gz b/Xsocks/Resources/pac.txt.gz
diff --git a/Xsocks/Resources/proxy.pac.txt.gz b/Xsocks/Resources/proxy.pac.txt.gz
diff --git a/Xsocks/Resources/xsocks.exe.gz b/Xsocks/Resources/xsocks.exe.gz
diff --git a/Xsocks/Xsocks.csproj b/Xsocks/Xsocks.csproj
@@ -108,16 +108,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="Resources\proxy.pac.txt.gz" />
+    <None Include="Resources\xsocks.exe.gz" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.manifest">
       <SubType>Designer</SubType>
     </None>
     <None Include="Resources\abp.js.gz" />
-    <None Include="Resources\pac.txt.gz" />
     <None Include="Resources\polipo.exe.gz" />
-    <None Include="Resources\proxy.pac.txt.gz" />
-    <None Include="Resources\xsocks.exe.gz" />
     <None Include="Resources\polipo_config.txt" />
     <None Include="Resources\user-rule.txt" />
     <Compile Include="Util\Util.cs" />