Merge branch 'master' into V1.1.0

This commit is contained in:
qianlifeng
2014-11-27 12:55:58 +08:00

View File

@@ -21,7 +21,6 @@ Download
Download from [release page](https://github.com/qianlifeng/Wox/releases).
* **Windows XP users:** You have to install [.NET Framework 3.5](http://www.microsoft.com/download/details.aspx?id=22) if you have not installed yet.
* **Windows 8 users:** You have to [enable the .NET Framework 3.5 in Control Panel](http://msdn.microsoft.com/library/hh506443.aspx).