Charlie Qiu c63f6b2ee3 Merge branch 'pr/159' into develop ...

# Conflicts:
#	ShadowsocksX-NG/Base.lproj/MainMenu.xib

2017-01-10 15:23:13 +08:00

..

AdvPreferencesWindowController.xib

Update AdvPreferencesWindowController.xib

2016-12-20 17:41:09 +08:00

HTTPPreferencesWindowController.xib

Fix typo

2016-10-26 19:32:27 +08:00

Localizable.strings

Update Localizable.strings

2016-12-20 17:43:03 +08:00

MainMenu.xib

Merge branch 'pr/159' into develop

2017-01-10 15:23:13 +08:00

PreferencesWindowController.xib

[ADD] option to duplicate server profile on preference

2017-01-05 18:26:33 +08:00

ProxyPreferencesController.xib

Corrected Spellings

2016-10-20 01:14:47 +08:00

UserRulesController.xib

Disable the rich text attribute of the user pac fule edit control.

2016-10-19 00:26:16 +08:00