Skip to content
This repository has been archived by the owner on Jul 18, 2020. It is now read-only.

Commit

Permalink
Merge branch 'dev' of https://github.com/Hyrules/WinHue3 into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Hyrules committed Oct 6, 2018
2 parents 79bc090 + 65f0c1b commit f5b5885
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
19 changes: 0 additions & 19 deletions WinHue3/Functions/BridgeManager/BridgeManager.cs

This file was deleted.

3 changes: 1 addition & 2 deletions WinHue3/WinHue3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
<DependentUpon>Form_BridgeFinder.xaml</DependentUpon>
</Compile>
<Compile Include="Functions\BridgeFinder\ProgressReport.cs" />
<Compile Include="Functions\BridgeManager\BridgeManager.cs" />
<Compile Include="Functions\BridgePairing\BridgeHandler.cs" />
<Compile Include="Functions\BridgeSettings\BridgeSettingsHiddenObjects.cs" />
<Compile Include="Functions\Converters\BoolToEnabledConverter.cs" />
Expand Down Expand Up @@ -977,7 +976,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_BuildVersioningStyle="None.None.Increment.None" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
<UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="..\..\..\..\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.None" />
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
Expand Down

0 comments on commit f5b5885

Please sign in to comment.