icylogic a30cb166a5 Merge branch 'hotfix/more_clear_log' into develop ...

# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs

2015-09-02 01:41:16 +08:00

..

Service

Merge branch 'hotfix/more_clear_log' into develop

2015-09-02 01:41:16 +08:00

Strategy

Merge branch 'master' into feature/statistics_ui

2015-09-02 00:51:14 +08:00

System

revert part of #257

2015-08-17 20:00:24 -07:00

FileManager.cs

update namespace

2014-11-08 01:02:50 +08:00

I18N.cs

same the source code format.

2015-08-19 00:24:08 +08:00

Logging.cs

add portable mode

2015-08-19 21:39:06 -07:00

ShadowsocksController.cs

Merge branch 'master' into feature/statistics_ui

2015-09-02 00:51:14 +08:00