Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
Sean Kaim
2016-07-11 16:25:53 -04:00
parent be02814021 11314972fa
commit 73a1923db6
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mRemoteV1/References/WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light.dll
View File

Binary file not shown.

BIN
mRemoteV1/References/WeifenLuo.WinFormsUI.Docking.dll
View File

Binary file not shown.

11
mRemoteV1/mRemoteV1.csproj
View File

@@ -93,12 +93,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>References\VncSharp.dll</HintPath>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.5.0.15095, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>References\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.9.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.2.10.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light">
<HintPath>References\WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light.dll</HintPath>
<Reference Include="WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light, Version=2.9.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
<HintPath>..\packages\DockPanelSuite.ThemeVS2012Light.2.10.0\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2012Light.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>

2
mRemoteV1/packages.config
View File

@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DockPanelSuite" version="2.10.0" targetFramework="net40" />
<package id="DockPanelSuite.ThemeVS2012Light" version="2.10.0" targetFramework="net40" />
<package id="Geckofx45" version="45.0.20" targetFramework="net40" />
</packages>