diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-07 23:14:39 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-07 23:37:55 +0300 |
| commit | ca78bf8f5953e9011b9f04db40cc0971736248e3 (patch) | |
| tree | 45fa4797c6b883a2bbf239066bfc8833b898e32b /main/Main.sln | |
| parent | be9302c3b8c14fbde009f4a6350e091edecbf4c5 (diff) | |
| parent | 270770894182fe9493ed87307ac2556b58d737b6 (diff) | |
Merge branch 'master' into editor
Diffstat (limited to 'main/Main.sln')
| -rw-r--r-- | main/Main.sln | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/Main.sln b/main/Main.sln index 3436c20772..a88b001e9c 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -776,16 +776,16 @@ Global {2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
- {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
- {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+ {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
+ {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
- {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
- {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+ {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
+ {2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1997,16 +1997,16 @@ Global {BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
- {BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
- {BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
+ {BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.Build.0 = Release|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
- {BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
- {BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
+ {BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
+ {BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU
{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
|