Commit f5c50aee authored by vestergaard fredrik - fvesterg's avatar vestergaard fredrik - fvesterg
Browse files

Merge branch 'Agata' into 'master'

UI_Stuff_toTest

See merge request !1
parents ba68cf4b bf4662ab

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{E3E8DD0A-2904-AB6B-68D1-9B2F8FBE6B54}"
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{0adde8e3-0429-6bab-68d1-9b2f8fbe6b54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E3E8DD0A-2904-AB6B-68D1-9B2F8FBE6B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E3E8DD0A-2904-AB6B-68D1-9B2F8FBE6B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E3E8DD0A-2904-AB6B-68D1-9B2F8FBE6B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E3E8DD0A-2904-AB6B-68D1-9B2F8FBE6B54}.Release|Any CPU.Build.0 = Release|Any CPU
{0adde8e3-0429-6bab-68d1-9b2f8fbe6b54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0adde8e3-0429-6bab-68d1-9b2f8fbe6b54}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
Supports Markdown
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