merged with develop

This commit is contained in:
Christian Fiedler
2013-11-18 16:08:05 +01:00
parent b604f02ec7
commit cf56df35d3
3 changed files with 4 additions and 1 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>