kimw 0b16ef7445 Merge upstream ...

# Conflicts:
#	README.md
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Service/PACServer.cs
#	shadowsocks-csharp/Controller/Strategy/SimplyChooseByStatisticsStrategy.cs
#	shadowsocks-csharp/Data/cn.txt
#	shadowsocks-csharp/Model/Configuration.cs
#	shadowsocks-csharp/Model/LogViewerConfig.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/LogForm.cs
#	shadowsocks-csharp/View/MenuViewController.cs

2016-01-04 09:14:55 +08:00

..

CalculationControl.cs

core functions finished

2015-09-03 23:37:43 +08:00

CalculationControl.Designer.cs

basic statistics form UI

2015-09-30 23:54:36 +08:00

CalculationControl.resx

Basic user controls

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

ConfigForm.cs

remove space by trim()

2015-11-20 22:49:42 +08:00

ConfigForm.Designer.cs

add chacha20-ietf support with updated libsscrypto

2015-12-17 18:25:13 +08:00

ConfigForm.resx

support customize the server order

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

LogForm.cs

Merge upstream

2016-01-04 09:14:55 +08:00

LogForm.Designer.cs

Merge upstream

2016-01-04 09:14:55 +08:00

LogForm.resx

improved log viewer:

2015-09-22 23:15:20 +08:00

MenuViewController.cs

Merge upstream

2016-01-04 09:14:55 +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

fix #389: crash on empty statistic data.

2015-12-08 22:53:29 +08:00

StatisticsStrategyConfigurationForm.Designer.cs

tiny fix

2015-09-30 23:59:03 +08:00

StatisticsStrategyConfigurationForm.resx

tiny fix

2015-09-30 23:59:03 +08:00