diff options
| author | Joel Corley <[email protected]> | 2018-07-19 15:21:37 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-19 15:21:37 -0700 |
| commit | 021af44b09f91a9d0ced14d26654cc238802f307 (patch) | |
| tree | dc7f5e99b796ea9fd918907411595501bf086a63 /setup/devcon/devcon.sln | |
| parent | 30ddbb997660fa4ae3608759b9d2d0789774ccdc (diff) | |
| parent | 84a856eda909e1084fa6b5978f9701398b67ec45 (diff) | |
Merge branch 'master' into rs4-update
Diffstat (limited to 'setup/devcon/devcon.sln')
| -rw-r--r-- | setup/devcon/devcon.sln | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/setup/devcon/devcon.sln b/setup/devcon/devcon.sln index 584555f8..5cd951c6 100644 --- a/setup/devcon/devcon.sln +++ b/setup/devcon/devcon.sln @@ -7,18 +7,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "devcon", "devcon.vcxproj", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Debug|ARM64.Build.0 = Debug|ARM64 {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Debug|Win32.ActiveCfg = Debug|Win32 {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Debug|Win32.Build.0 = Debug|Win32 - {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|Win32.ActiveCfg = Release|Win32 - {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|Win32.Build.0 = Release|Win32 {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Debug|x64.ActiveCfg = Debug|x64 {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Debug|x64.Build.0 = Debug|x64 + {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|ARM64.ActiveCfg = Release|ARM64 + {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|ARM64.Build.0 = Release|ARM64 + {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|Win32.ActiveCfg = Release|Win32 + {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|Win32.Build.0 = Release|Win32 {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|x64.ActiveCfg = Release|x64 {14EDBD07-E4CD-4BD8-82CC-F2840C160570}.Release|x64.Build.0 = Release|x64 EndGlobalSection |