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/App.xaml
changeset 30 644e3cd48034
parent 27 f292db96b050 
--- a/client/src/Iri.Modernisation/App.xaml	Fri Jan 08 11:33:24 2010 +0100
+++ b/client/src/Iri.Modernisation/App.xaml	Thu Jan 14 16:39:50 2010 +0100
@@ -7,9 +7,10 @@
     	<ResourceDictionary>
     		<ResourceDictionary.MergedDictionaries>
     			<ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_CommonTemplate.xaml"/>
-    			<ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_AnnotationMaker.xaml"/>
     			<ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_ConsultMenu.xaml"/>
     			<ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_Binder.xaml"/>
+    			<ResourceDictionary Source="/Iri.Modernisation.Styles;Component/Templates_AnnotationMaker.xaml"/>
+    			<ResourceDictionary Source="/Iri.Modernisation.Controls;Component/Templates_CommonTemplate.xaml"/>
     		</ResourceDictionary.MergedDictionaries>
     	</ResourceDictionary>
videolivre