icylogic 2086b5900d Merge remote-tracking branch 'upstream/master' into feature/statistics_ui ...

# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs

2016-02-29 20:56:01 +08:00

..

BalancingStrategy.cs

add HA

2015-07-24 04:17:33 +08:00

HighAvailabilityStrategy.cs

fixed: standardize Logging usage

2015-09-14 14:58:46 +08:00

IStrategy.cs

same the source code format.

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

StatisticsStrategy.cs

Merge remote-tracking branch 'upstream/master' into feature/statistics_ui

2016-02-29 20:56:01 +08:00

StrategyManager.cs

Basic user controls

2015-08-16 20:07:51 +08:00