xuemingqiang/ShadowsocksX-NG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/1.4.0

Browse Source
This commit is contained in:
Charlie Qiu
2017-02-07 15:40:22 +08:00
parent 8aaffbb6a3 2a17f43965
commit 7cfef2a8e9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -31,7 +31,7 @@ Then I will rewrite the GUI code in Swift.
From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/) From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/)
## Fetures ## Features
- Use ss-local from shadowsocks-libev 2.5.6 - Use ss-local from shadowsocks-libev 2.5.6
- Could Update PAC by download GFW List from GitHub. - Could Update PAC by download GFW List from GitHub.
@ -62,7 +62,9 @@ Then you could configure your apps to use socks5 proxy manual.
Added global Keyboard shortcut <kbd>⌃</kbd> + <kbd>⌘</kbd> + <kbd>P</kbd> to switch between `global` mode and `auto` mode. Added global Keyboard shortcut <kbd>⌃</kbd> + <kbd>⌘</kbd> + <kbd>P</kbd> to switch between `global` mode and `auto` mode.
## Contributing ## Contributing
[![gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ShadowsocksX-NG/Lobby)
Contributions must be available on a separately named branch based on the latest version of the main branch develop. Contributions must be available on a separately named branch based on the latest version of the main branch develop.