update default hotkey, license

Marcus-L · Oct 21, 2017 · cf17754 · cf17754
1 parent ce1e4f1
commit cf17754
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/FreeVD.sln b/FreeVD.sln
@@ -7,6 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeVD", "FreeVD\FreeVD.csp
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F9A6D54-48E3-4ACB-BB68-699C91B4373B}"
 	ProjectSection(SolutionItems) = preProject
+		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject

diff --git a/FreeVD/App/VDHotkey.cs b/FreeVD/App/VDHotkey.cs
@@ -101,7 +101,7 @@ public static IEnumerable<VDHotkey> CreateDefaultHotkeys()
                     Action = VDAction.MoveWindowToPreviousDesktop,
                     Follow = true
                 },
-                new VDHotkey(Keys.Z, Keys.Control | Keys.LWin)
+                new VDHotkey(Keys.W, Keys.Control | Keys.LWin)
                 {
                     Action = VDAction.TogglePinWindow
                 },

diff --git a/FreeVD/Properties/AssemblyInfo.cs b/FreeVD/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("FreeVD")]
 [assembly: AssemblyDescription("Windows 10 Virtual Desktop Utility")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("m4rc.us")]
 [assembly: AssemblyProduct("FreeVD")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyCopyright("Copyright m4rc.us © 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/LICENSE b/LICENSE
@@ -20,8 +20,17 @@ SOFTWARE.
 
 Credits
 ===================================================================================
+Copyright (c) .NET Foundation and Contributors
+Rx.NET: https://github.com/Reactive-Extensions/Rx.NET
+
+Copyright (c) 2007 James Newton-King
+Newtonsoft.Json: https://www.newtonsoft.com/json
+
+Copyright (c) 2012-2014 Mehdi Khalili
+Humanizer: https://github.com/Humanizr/Humanizer
+
 Copyright (c) 2017 Michael Zomparelli
 zVirtualDesktop: https://github.com/mzomparelli/zVirtualDesktop/tree/b623c87da69e9b45cf87141a216787a30477b934
 
 Copyright (c) 2015 Manato KAMEYA
-Wrapper for API to Virtual Desktop on Windows 10: https://github.com/Grabacr07/VirtualDesktop
+VirtualDesktop: https://github.com/Grabacr07/VirtualDesktop