Merge branch 'master' into dev

This commit is contained in:
bao-qian
2015-11-04 16:23:50 +00:00
165 changed files with 1152 additions and 2030 deletions

View File

@@ -5,7 +5,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Windows;
using Control = System.Windows.Controls.Control;
using System.Windows.Controls;
namespace Wox.Plugin.Folder
{