Commit 30480ec4 authored by Martin Finkel's avatar Martin Finkel

fix sln rebase

parent a76059ef
......@@ -21,10 +21,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForegroundBackground.Androi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForegroundBackground.iOS", "ForegroundBackground\ForegroundBackground.iOS\ForegroundBackground.iOS.csproj", "{32863993-BD7F-41F9-B22C-21E4FCD05998}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ForegroundBackground", "ForegroundBackground\ForegroundBackground\ForegroundBackground.csproj", "{9A168B62-AE4F-42A5-9960-44DE18D04C31}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForegroundBackground", "ForegroundBackground\ForegroundBackground\ForegroundBackground.csproj", "{9A168B62-AE4F-42A5-9960-44DE18D04C31}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PulseMusic", "PulseMusic\src\PulseMusic\PulseMusic\PulseMusic.csproj", "{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}"Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PulseMusic", "PulseMusic\src\PulseMusic\PulseMusic\PulseMusic.csproj", "{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PulseMusic", "PulseMusic\src\PulseMusic\PulseMusic\PulseMusic.csproj", "{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PulseMusic.Android", "PulseMusic\src\PulseMusic\PulseMusic.Android\PulseMusic.Android.csproj", "{5C5B9DB8-91CE-4B22-9559-205413D2729A}"
EndProject
......@@ -290,6 +289,86 @@ Global
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.AppStore|Any CPU.Build.0 = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.AppStore|iPhone.Build.0 = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Debug|iPhone.Build.0 = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Release|Any CPU.Build.0 = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Release|iPhone.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Release|iPhone.Build.0 = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{9A168B62-AE4F-42A5-9960-44DE18D04C31}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.AppStore|iPhone.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Debug|iPhone.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Release|Any CPU.Build.0 = Release|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Release|iPhone.ActiveCfg = Release|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Release|iPhone.Build.0 = Release|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{E9276DC7-9BD1-4B28-BE5D-ECF1093FB4B1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|Any CPU.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|iPhone.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|iPhone.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|iPhone.Build.0 = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|iPhone.Deploy.0 = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|Any CPU.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|Any CPU.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|iPhone.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|iPhone.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|iPhone.Deploy.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{5C5B9DB8-91CE-4B22-9559-205413D2729A}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
{C9F0F801-61E0-4297-B3AB-32FCA8998395}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
{C9F0F801-61E0-4297-B3AB-32FCA8998395}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
{C9F0F801-61E0-4297-B3AB-32FCA8998395}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment