# HG changeset patch
# User StephaneLenclud
# Date 1432635934 -7200
# Node ID 9e88c1a8cc1d92f472eafff59affc5f276e0fe6e
# Parent  426cc984fd180aaa48d4e6e71ef140a70c450312# Parent  03affbf868a6d36761dbf301dc4da32ee717463e
Merge

diff -r 426cc984fd18 -r 9e88c1a8cc1d Server/MiniDisplay.dll
Binary file Server/MiniDisplay.dll has changed
diff -r 426cc984fd18 -r 9e88c1a8cc1d Server/SharpDisplayManager.csproj
--- a/Server/SharpDisplayManager.csproj	Tue May 26 12:23:55 2015 +0200
+++ b/Server/SharpDisplayManager.csproj	Tue May 26 12:25:34 2015 +0200
@@ -237,8 +237,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="MiniDisplay.dll" />
-    <Content Include="MiniDisplay.h" />
     <EmbeddedResource Include="Resources\vfd.ico" />
   </ItemGroup>
   <ItemGroup>