Merge branch 'master' into setupBranch

2020-10-22 15:46:20 +02:00
parent cac0fdc0a4 d4d0545f0b
commit 1fdba622cc
10 changed files with 595 additions and 436 deletions
--- a/Client/Views/GameWindow.xaml
+++ b/Client/Views/GameWindow.xaml
@@ -3,7 +3,6 @@
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Client.Views"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
        Title="Scrubl.io" Height="600" Width="1200">