Mercurial Mercurial > videolivre / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client/src/Iri.Modernisation.Controls/View/NavigationBar/ConsultMenu.xaml
changeset 30 644e3cd48034
parent 4 cf756528609e
child 42 594fdedecf7f 
--- a/client/src/Iri.Modernisation.Controls/View/NavigationBar/ConsultMenu.xaml	Fri Jan 08 11:33:24 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/NavigationBar/ConsultMenu.xaml	Thu Jan 14 16:39:50 2010 +0100
@@ -11,8 +11,14 @@
      xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions" Height="280"
 	>
     <UserControl.Resources>
+
         <ResourceDictionary>
-        <Lang:LangResource x:Name="LangLabels" x:Key="LangLabels"></Lang:LangResource>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_CommonTemplate.xaml"/>
+                <ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_Binder.xaml"/>
+
+            </ResourceDictionary.MergedDictionaries>
+			    <Lang:LangResource x:Name="LangLabels" x:Key="LangLabels"></Lang:LangResource>
         </ResourceDictionary>
     </UserControl.Resources>
         <StackPanel x:Name="ConsultMenuPanel">
videolivre