Merge
authorStephaneLenclud
Tue, 26 May 2015 12:25:34 +0200
changeset 1399e88c1a8cc1d
parent 138 426cc984fd18
parent 137 03affbf868a6
child 140 4dff57d255c9
Merge
Server/MiniDisplay.dll
     1.1 Binary file Server/MiniDisplay.dll has changed
     2.1 --- a/Server/SharpDisplayManager.csproj	Tue May 26 12:23:55 2015 +0200
     2.2 +++ b/Server/SharpDisplayManager.csproj	Tue May 26 12:25:34 2015 +0200
     2.3 @@ -237,8 +237,6 @@
     2.4      </BootstrapperPackage>
     2.5    </ItemGroup>
     2.6    <ItemGroup>
     2.7 -    <Content Include="MiniDisplay.dll" />
     2.8 -    <Content Include="MiniDisplay.h" />
     2.9      <EmbeddedResource Include="Resources\vfd.ico" />
    2.10    </ItemGroup>
    2.11    <ItemGroup>