From cf56df35d3a0373e695a944540590ac6aaa02edc Mon Sep 17 00:00:00 2001
From: Christian Fiedler <fiedlchr@tu-cottbus.de>
Date: Mon, 18 Nov 2013 16:08:05 +0100
Subject: [PATCH] merged with develop

---
 CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj         | 3 ++-
 CampusAppWP8/CampusAppWP8/Resources/AppResources.resx | 1 +
 CampusAppWP8/CampusAppWP8/Resources/Constants.resx    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index fefe0d7d..00e17b16 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -255,6 +255,7 @@
     <Compile Include="Utility\Lui\ListBoxFixed.cs" />
     <Compile Include="Utility\Lui\Templates\AppointmentCanvas.xaml.cs">
       <DependentUpon>AppointmentCanvas.xaml</DependentUpon>
+	</Compile>
     <Compile Include="Utility\Lui\MultiValueTextBlock.xaml.cs">
       <DependentUpon>MultiValueTextBlock.xaml</DependentUpon>
     </Compile>
@@ -541,7 +542,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Utility\Lui\Templates\AppointmentCanvas.xaml">
+    <Page Include="Utility\Lui\Templates\AppointmentCanvas.xaml"/>
     <Page Include="Utility\Lui\MultiValueTextBlock.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index 6bdddefb..4d494990 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -598,6 +598,7 @@
   </data>
   <data name="Calendar_Week_Short" xml:space="preserve">
     <value>KW</value>
+  </data>
   <data name="Employees" xml:space="preserve">
     <value>Angestellte</value>
   </data>
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index 28a28b70..a7a62d34 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -602,6 +602,7 @@
   </data>
   <data name="PisInformationName_Room" xml:space="preserve">
     <value>Raumnummer</value>
+  </data>
   <data name="FileMensaPrice" xml:space="preserve">
     <value>mensaprice.xml</value>
   </data>