Mercurial Mercurial > fingersdance / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update characters because merge made strange things with encoding.
authorcavaliet
Wed, 14 Oct 2009 17:42:22 +0200
changeset 151 5f011a5ce421
parent 150 569925b65604
child 152 46577fd0a294
update characters because merge made strange things with encoding.
src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Wed Oct 14 17:08:43 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Wed Oct 14 17:42:22 2009 +0200
@@ -782,6 +782,6 @@
         <Custom:SurfaceSlider  Height="Auto" x:Name="slider" Value="0.5" Width="Auto" 
                                Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" />
         <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}"/>
-        <popup:UserControlClose x:Name="confirmCancelPopup" Question="Êtes-vous de sûr de vouloir effacer cette annotation ?" Visibility="Hidden" ConfirmYesOrNo="confirmCancelPopup_ConfirmYesOrNo" />
+        <popup:UserControlClose x:Name="confirmCancelPopup" Question="Êtes-vous de sûr de vouloir effacer cette annotation ?" Visibility="Hidden" ConfirmYesOrNo="confirmCancelPopup_ConfirmYesOrNo" />
     </Grid>
 </UserControl>
\ No newline at end of file
fingersdance