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.
Merge
authorcavaliet
Fri, 16 Oct 2009 16:26:21 +0200
changeset 161 643d31851d02
parent 160 e940ca798fe3 (current diff)
parent 159 d479ee448afc (diff)
child 162 0b9f989bcb37
Merge
--- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml	Fri Oct 16 15:56:09 2009 +0200
+++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml	Fri Oct 16 16:26:21 2009 +0200
@@ -12,10 +12,10 @@
 
 
     <Grid x:Name="LayoutRoot" Background="{x:Null}">
-        <Grid x:Name="GridSyncSource" Margin="136,0,0,0" Background="{x:Null}">
+        <Grid x:Name="GridSyncSource" Margin="174,0,0,0" Background="{x:Null}">
         	<FingersDance_Control_SyncSource:UserControlSyncSource x:Name="UserControlSyncSource" HorizontalAlignment="Left" VerticalAlignment="Top" Width="{Binding Path=ActualWidth, ElementName=GridSyncSource, Mode=Default}" Margin="0,0,0,0" Height="{Binding Path=ActualHeight, ElementName=GridSyncSource, Mode=Default}"/>
         </Grid>
-        <Grid HorizontalAlignment="Left" Width="132" x:Name="GridMenu" Background="{x:Null}" Margin="0,49,0,0">
+        <Grid HorizontalAlignment="Left" Width="170" x:Name="GridMenu" Background="{x:Null}" Margin="0,49,0,0">
             <FingersDance_Control_Menu:UserControlMenu x:Name="UserControlMenu" Width="{Binding Path=ActualWidth, ElementName=GridMenu, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=GridMenu, Mode=Default}" Margin="0,0,0,0"/>
         </Grid>
 
--- a/src/FingersDance/Resources/videos.xml	Fri Oct 16 15:56:09 2009 +0200
+++ b/src/FingersDance/Resources/videos.xml	Fri Oct 16 16:26:21 2009 +0200
@@ -2,17 +2,17 @@
 <ArrayOfListVideoItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <ListVideoItem>
     <Name>Butterfly</Name>
-    <Path>C:\Users\Piaf\Desktop\Développement\IRI\src\FingersDance\bin\Debug\Resources\Butterfly.wmv</Path>
-    <Preview>C:\Users\Piaf\Desktop\Développement\IRI\src\FingersDance\bin\Debug\Resources\Butterfly.jpg</Preview>
+    <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Butterfly.wmv</Path>
+    <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Butterfly.jpg</Preview>
   </ListVideoItem>
   <ListVideoItem>
     <Name>Lake</Name>
-    <Path>C:\Users\Piaf\Desktop\Développement\IRI\src\FingersDance\bin\Debug\Resources\Lake.wmv</Path>
-    <Preview>C:\Users\Piaf\Desktop\Développement\IRI\src\FingersDance\bin\Debug\Resources\Lake.jpg</Preview>
+    <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Lake.wmv</Path>
+    <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Lake.jpg</Preview>
   </ListVideoItem>
   <ListVideoItem>
     <Name>One Flat Thing</Name>
-    <Path>C:\Users\Piaf\Desktop\Développement\IRI\src\FingersDance\bin\Debug\Resources\oneflat.wmv</Path>
-    <Preview>C:\Users\Piaf\Desktop\Développement\IRI\src\FingersDance\bin\Debug\Resources\oneflat.png</Preview>
+    <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\oneflat.wmv</Path>
+    <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\oneflat.png</Preview>
   </ListVideoItem>
 </ArrayOfListVideoItem>
\ No newline at end of file
fingersdance