diff options
| author | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
|---|---|---|
| committer | Nicole Vreden <damba@slartibartfast.traut> | 2009-12-30 19:20:54 +0100 |
| commit | a02ae21955b5fbc6e1922debb514392739790628 (patch) | |
| tree | 3090475c0ec91d98ab6ec9b03e72eacce511c3d4 /src/YalpClients/WebClient/App.xaml | |
| parent | 97ecea2efaff1daa73492ecbc56835f985be62f3 (diff) | |
| parent | 662d4edc187427bbabb75bad3daa3a02007f783c (diff) | |
Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba
Conflicts:
src/YalpClients/EflClient/list_test.edc
src/YalpClients/EflClient/list_test_elem.py
Signed-off-by: Nicole Vreden <damba@slartibartfast.traut>
Diffstat (limited to 'src/YalpClients/WebClient/App.xaml')
| -rw-r--r-- | src/YalpClients/WebClient/App.xaml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/YalpClients/WebClient/App.xaml b/src/YalpClients/WebClient/App.xaml index 48a0475..4919f98 100644 --- a/src/YalpClients/WebClient/App.xaml +++ b/src/YalpClients/WebClient/App.xaml @@ -1,8 +1,8 @@ -<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" - xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - x:Class="VideoPlayer.App" - > - <Application.Resources> - - </Application.Resources> -</Application> +<Application xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="VideoPlayer.App"
+ >
+ <Application.Resources>
+
+ </Application.Resources>
+</Application>
|