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/VideoPlayer.sln | |
| 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/VideoPlayer.sln')
| -rw-r--r-- | src/YalpClients/WebClient/VideoPlayer.sln | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/YalpClients/WebClient/VideoPlayer.sln b/src/YalpClients/WebClient/VideoPlayer.sln index 9ef3f22..2057756 100644 --- a/src/YalpClients/WebClient/VideoPlayer.sln +++ b/src/YalpClients/WebClient/VideoPlayer.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Web Developer Express 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VideoPlayer", "VideoPlayer.csproj", "{9254F122-1734-4DEC-9859-49C16D114EBA}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9254F122-1734-4DEC-9859-49C16D114EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9254F122-1734-4DEC-9859-49C16D114EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9254F122-1734-4DEC-9859-49C16D114EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9254F122-1734-4DEC-9859-49C16D114EBA}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Web Developer Express 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VideoPlayer", "VideoPlayer.csproj", "{9254F122-1734-4DEC-9859-49C16D114EBA}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {9254F122-1734-4DEC-9859-49C16D114EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9254F122-1734-4DEC-9859-49C16D114EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9254F122-1734-4DEC-9859-49C16D114EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9254F122-1734-4DEC-9859-49C16D114EBA}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
|