Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/Chat

This commit is contained in:
Christian
2017-09-15 13:48:36 +02:00
10 changed files with 327 additions and 44 deletions

View File

@@ -55,6 +55,7 @@
<DependentUpon>ChatEmojiiControl.xaml</DependentUpon>
</Compile>
<Compile Include="ChatKlassen\AktuellerKontakt.cs" />
<Compile Include="ChatKlassen\ChatControlExtensions.cs" />
<Compile Include="ChatKlassen\KontaktlistBuilder.cs" />
<Compile Include="ChatKlassen\KontaktMessageBuilder.cs" />
<Compile Include="ChatKlassen\MessageCounter.cs" />
@@ -73,6 +74,9 @@
<Compile Include="LoginKlassen\UserDaten.cs" />
<Compile Include="LoginKlassen\UserMessages.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ChatControlWaitLayer.xaml.cs">
<DependentUpon>ChatControlWaitLayer.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Page Include="ChatEmojiiControl.xaml">
@@ -87,6 +91,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ChatControlWaitLayer.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Resource Include="Ressourcen\BeyondsoftChat.jpg" />