Merge branch 'gamepad' into develop

Conflicts:
	Source/OpenTK/OpenTK.csproj

diff --cc Source/OpenTK/OpenTK.csproj
index 92404b7,93d0a42..d9b969c
--- 1/Source/OpenTK/OpenTK.csproj
--- 2/Source/OpenTK/OpenTK.csproj
+++ b/Source/OpenTK/OpenTK.csproj
@@@ -777,7 -787,16 +787,17 @@@
      <Compile Include="SlotAttribute.cs" />
      <Compile Include="RewrittenAttribute.cs" />
      <Compile Include="Graphics\OpenGL\GLObsolete.cs" />
 +    <Compile Include="Platform\MacOS\NS.cs" />
+     <Compile Include="Input\GamePadCapabilities.cs" />
+     <Compile Include="Input\GamePadDPad.cs" />
+     <Compile Include="Input\GamePadButtons.cs" />
+     <Compile Include="Input\Buttons.cs" />
+     <Compile Include="Input\GamePadConfigurationDatabase.cs" />
+     <Compile Include="Input\GamePadConfiguration.cs" />
+     <Compile Include="Input\GamePadConfigurationTarget.cs" />
+     <Compile Include="Input\ConfigurationType.cs" />
+     <Compile Include="Input\GamePadConfigurationSource.cs" />
+     <Compile Include="Input\GamePadConfigurationItem.cs" />
    </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    <PropertyGroup>

diff --cc Source/OpenTK/Platform/MacOS/MacOSFactory.cs
Simple merge

diff --cc Source/OpenTK/Platform/SDL2/Sdl2.cs
Simple merge