OSDN Git Service
(root)
/
psychlops
/
silverlight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5
[psychlops/silverlight.git]
/
test5
/
MainPage.xaml
diff --git
a/test5/MainPage.xaml
b/test5/MainPage.xaml
index
6487be3
..
e445449
100644
(file)
--- a/
test5/MainPage.xaml
+++ b/
test5/MainPage.xaml
@@
-1,7
+1,8
@@
-<UserControl x:Class="PsychlopsSilverlight
4
test.MainPage"
\r
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
\r
+<UserControl x:Class="PsychlopsSilverlight
5
test.MainPage"
\r
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
\r
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
\r
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
\r
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
\r
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
\r
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
\r
mc:Ignorable="d" d:DesignWidth="640" d:DesignHeight="480">
\r
<StackPanel x:Name="TotalRoot">
\r
<Grid>
\r
mc:Ignorable="d" d:DesignWidth="640" d:DesignHeight="480">
\r
<StackPanel x:Name="TotalRoot">
\r
<Grid>
\r
@@
-13,7
+14,7
@@
\r
<StackPanel x:Name="Controller" Grid.Column="0">
\r
</StackPanel>
\r
\r
<StackPanel x:Name="Controller" Grid.Column="0">
\r
</StackPanel>
\r
-
\r
+
\r
<Canvas x:Name="LayoutRoot" Grid.Column="1"></Canvas>
\r
\r
</Grid>
\r
<Canvas x:Name="LayoutRoot" Grid.Column="1"></Canvas>
\r
\r
</Grid>
\r