icylogic aa2334c9fd Merge branch 'master' into feature/statistics_ui ...

# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/MenuViewController.cs

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

..

CalculationControl.cs

Basic user controls

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

CalculationControl.Designer.cs

Basic user controls

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

CalculationControl.resx

Basic user controls

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

ConfigForm.cs

prevent moving up and down when unsaved

2015-08-19 19:35:37 -07:00

ConfigForm.Designer.cs

support customize the server order

2015-08-18 23:48:52 +08:00

ConfigForm.resx

support customize the server order

2015-08-18 23:48:52 +08:00

LogForm.cs

small fix

2015-08-19 21:51:28 -07:00

LogForm.Designer.cs

improved log viewer:

2015-08-19 21:52:16 +08:00

LogForm.resx

bump 2.5.2

2015-08-04 01:47:21 -07:00

MenuViewController.cs

same the source code format.

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

QRCodeForm.cs

Added list of servers in QRCode generate window to select.

2015-08-07 00:53:07 +08:00

QRCodeForm.Designer.cs

Added list of servers in QRCode generate window to select.

2015-08-07 00:53:07 +08:00

QRCodeForm.resx

Added list of servers in QRCode generate window to select.

2015-08-07 00:53:07 +08:00

QRCodeSplashForm.cs

same the source code format.

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

StatisticsStrategyConfigurationForm.cs

Basic user controls

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

StatisticsStrategyConfigurationForm.Designer.cs

Basic user controls

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

StatisticsStrategyConfigurationForm.resx

Basic user controls

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