Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
wzxjohn
2014-11-09 03:24:06 +08:00
parent d28e646ec7 2585f4d615
commit 5253cc3ca5
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+6 -2
View File
@@ -16,6 +16,10 @@ Shadowsocks for Windows
Download [latest release].
For Windows 7 and older, please download Shadowsocks-win-x.x.x.zip.
For Windows 8.1 and newer, please download Shadowsocks-win-dotnet4.0-x.x.x.zip.
### Usage
1. Find Shadowsocks icon in notification tray
@@ -25,8 +29,8 @@ Download [latest release].
about the change automatically
5. Please disable other proxy addons in your browser, or set them to use
system proxy
6. You may need to install VC 2008 Runtime and .Net 2.0 if Shadowsocks failed to
start
6. You may need to install VC 2008 Runtime and .Net framework if Shadowsocks
failed to start
### License
shadowsocks-csharp/Properties/Resources.Designer.cs
Generated
+15 -11
View File
@@ -113,26 +113,30 @@ namespace Shadowsocks.Properties {
/// __QRCODELIB__
///</script>
///<style>
/// body {
/// padding: 10px;
/// margin: 0;
/// html, body, table, div {
/// padding: 0px;
/// margin: 0 !important;
/// }
/// div#qrcode {
/// margin: 5px !important;
/// text-align: center;
/// vertical-align: center;
/// }
/// #qrcode {
/// width:300px;
/// height:300px;
/// width:190px;
/// height:190px;
/// }
/// table {
/// width: 100%;
/// height:100%;
/// }
///</style>
///</head>
///<body>
///<div id="qrcode" name="qrcode"></div>
///<script type="text/javascript">
/// function genCode(code) {
/// new QRCode("qrcode", {
/// text: code,
/// width: 300,
/// height: 300,
/// colorDark : "#000000",
/// colorLig [rest of string was truncated]";.
/// new QRCode("qrcode" [rest of string was truncated]";.
/// </summary>
internal static string qrcode {
get {
shadowsocks-csharp/app.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v2.0.50727"/>
<supportedRuntime version="v4.0"/>
<supportedRuntime version="v2.0.50727"/>
</startup></configuration>
shadowsocks-csharp/shadowsocks-csharp.csproj
+4 -4
View File
@@ -21,7 +21,8 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -45,6 +46,7 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
@@ -54,15 +56,13 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="3rd\QRCodeCS.cs" />