2 Commits

Include renames

Author	SHA1	Message	Date
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
icylogic	bf1c79304e	Basic user controls	2015-08-16 20:07:51 +08:00