From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 5 Jan 2017 14:47:33 +0000 (+0100)
Subject: Merge branch 'master' into CrowIDE
X-Git-Tag: v0.9.5-beta~259^2~12
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=49346012274739fd39745f9e035ee8853149bc73;p=jp%2Fcrow.git

Merge branch 'master' into CrowIDE
---

49346012274739fd39745f9e035ee8853149bc73
diff --cc Templates/ColorPicker.template
index e128ff71,4c1e1280..dbc34851
--- a/Templates/ColorPicker.template
+++ b/Templates/ColorPicker.template
@@@ -46,4 -46,4 +46,4 @@@
  				</HorizontalStack>
  			</VerticalStack>
  		</HorizontalStack>
--</Border>
++</Border>
diff --cc Tests/Tests.csproj
index ea03ce1a,a95a034a..7fd48e36
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@@ -46,7 -45,7 +45,8 @@@
  	<Reference Include="gio-sharp"/>
  	<Reference Include="glib-sharp"/>
      <Reference Include="OpenTK">
-       <HintPath>$(SolutionDir)packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll</HintPath>
+       <HintPath>$(SolutionDir)packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
++      <Package>opentk</Package>
      </Reference>
    </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />