Alawn/ShadowsocksX-NG-R
1
0
Fork 0
mirror of https://github.com/qinyuhang/ShadowsocksX-NG-R.git synced 2026-11-05 18:55:07 +00:00
Code Releases Activity

Compare commits

base: Alawn/ShadowsocksX-NG-R:1.4.3-R8
Branches Tags
Alawn/ShadowsocksX-NG-R:rm Alawn/ShadowsocksX-NG-R:feature_swift_5 Alawn/ShadowsocksX-NG-R:develop Alawn/ShadowsocksX-NG-R:fix_QR_GPU Alawn/ShadowsocksX-NG-R:master Alawn/ShadowsocksX-NG-R:feature/subscribe Alawn/ShadowsocksX-NG-R:release/1.4.0
Alawn/ShadowsocksX-NG-R:1.4.4-r8 Alawn/ShadowsocksX-NG-R:1.4.4-r8-resigning Alawn/ShadowsocksX-NG-R:1.4.3-R8-build3 Alawn/ShadowsocksX-NG-R:1.4.3-R8-build2 Alawn/ShadowsocksX-NG-R:1.4.3-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8-fix-subscribe Alawn/ShadowsocksX-NG-R:v1.4-beta Alawn/ShadowsocksX-NG-R:v1.4-alpha Alawn/ShadowsocksX-NG-R:1.3.2 Alawn/ShadowsocksX-NG-R:1.3.1 Alawn/ShadowsocksX-NG-R:1.3 Alawn/ShadowsocksX-NG-R:1.2 Alawn/ShadowsocksX-NG-R:1.1 Alawn/ShadowsocksX-NG-R:1.0 Alawn/ShadowsocksX-NG-R:v1.0-beta2 Alawn/ShadowsocksX-NG-R:v1.0-beta
..
compare: Alawn/ShadowsocksX-NG-R:1.4.3-R8-build2
Branches Tags
Alawn/ShadowsocksX-NG-R:feature_swift_5 Alawn/ShadowsocksX-NG-R:develop Alawn/ShadowsocksX-NG-R:rm Alawn/ShadowsocksX-NG-R:fix_QR_GPU Alawn/ShadowsocksX-NG-R:master Alawn/ShadowsocksX-NG-R:feature/subscribe Alawn/ShadowsocksX-NG-R:release/1.4.0
Alawn/ShadowsocksX-NG-R:1.4.4-r8 Alawn/ShadowsocksX-NG-R:1.4.4-r8-resigning Alawn/ShadowsocksX-NG-R:1.4.3-R8-build3 Alawn/ShadowsocksX-NG-R:1.4.3-R8-build2 Alawn/ShadowsocksX-NG-R:1.4.3-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8 Alawn/ShadowsocksX-NG-R:1.4.2-R8-fix-subscribe Alawn/ShadowsocksX-NG-R:v1.4-beta Alawn/ShadowsocksX-NG-R:v1.4-alpha Alawn/ShadowsocksX-NG-R:1.3.2 Alawn/ShadowsocksX-NG-R:1.3.1 Alawn/ShadowsocksX-NG-R:1.3 Alawn/ShadowsocksX-NG-R:1.2 Alawn/ShadowsocksX-NG-R:1.1 Alawn/ShadowsocksX-NG-R:1.0 Alawn/ShadowsocksX-NG-R:v1.0-beta2 Alawn/ShadowsocksX-NG-R:v1.0-beta
4 Commits
1.4.3-R8 .. 1.4.3-R8-build2
Author SHA1 Message Date
秦宇航 f38ade4584 Bump Build version 2017-10-21 10:23:10 +08:00
秦宇航 abfb8c1dd3 Merge branch 'develop' of github.com:qinyuhang/shadowsocksX-NG-R into develop 2017-10-21 10:12:06 +08:00
秦宇航 61e40e77bf Fix show QR require GPU 2017-10-21 10:09:59 +08:00
ImPerat0R_ 8baf1c8485 Fix typo. (#12) 
* Fix typo.

* Fix typo
 2017-09-07 18:02:21 +08:00
4 changed files with 5 additions and 5 deletions
Expand all files Collapse all files
ShadowsocksX-NG/Base.lproj/PreferencesWindowController.xib
+1 -1
View File
@@ -375,7 +375,7 @@ DQ
<constraints> <constraints>
<constraint firstAttribute="width" constant="69" id="s2I-cF-RJc"/> <constraint firstAttribute="width" constant="69" id="s2I-cF-RJc"/>
</constraints> </constraints>
<buttonCell key="cell" type="push" title="Cacnel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-9E-uHW"> <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j03-9E-uHW">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES"> <string key="keyEquivalent" base64-UTF8="YES">
ShadowsocksX-NG/Info.plist
+1 -1
View File
@@ -48,7 +48,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>2</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string> <string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
ShadowsocksX-NG/SWBQRCodeWindowController.m
+2 -2
View File
@@ -50,9 +50,9 @@
CGContextRef bitmapRef = CGBitmapContextCreate(nil, width, height, 8, 0, cs, (CGBitmapInfo)kCGImageAlphaNone); CGContextRef bitmapRef = CGBitmapContextCreate(nil, width, height, 8, 0, cs, (CGBitmapInfo)kCGImageAlphaNone);
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
CIContext *context = [CIContext contextWithOptions:nil]; CIContext *context = [CIContext contextWithOptions: @{kCIContextUseSoftwareRenderer: true}];
#else #else
CIContext *context = [CIContext contextWithCGContext:bitmapRef options:nil]; CIContext *context = [CIContext contextWithCGContext:bitmapRef options:@{kCIContextUseSoftwareRenderer: @true}];
#endif #endif
CGImageRef bitmapImage = [context createCGImage:image fromRect:extent]; CGImageRef bitmapImage = [context createCGImage:image fromRect:extent];
ShadowsocksX-NG/zh-Hans.lproj/PreferencesWindowController.strings
+1 -1
View File
@@ -26,7 +26,7 @@
/* Class = "NSTextFieldCell"; title = "Obfs Param"; ObjectID = "g7c-fW-7J4"; */ /* Class = "NSTextFieldCell"; title = "Obfs Param"; ObjectID = "g7c-fW-7J4"; */
"g7c-fW-7J4.title" = "混淆参数:"; "g7c-fW-7J4.title" = "混淆参数:";
/* Class = "NSButtonCell"; title = "Cacnel"; ObjectID = "j03-9E-uHW"; */ /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "j03-9E-uHW"; */
"j03-9E-uHW.title" = "取消"; "j03-9E-uHW.title" = "取消";
/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */ /* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "kil-xC-HPD"; */