# HG changeset patch
# User cavaliet
# Date 1255534942 -7200
# Node ID 5f011a5ce4215cce6d36deac05366302ec068965
# Parent  569925b65604416cf883d94fd5f11dd8a00efb50
update characters because merge made strange things with encoding.

diff -r 569925b65604 -r 5f011a5ce421 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml
--- 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