Merge branch 'master' into update-boogie

Author: zvonimir

cba.sln

@@ -17,8 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BctCleanup", "source\BctCle
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExplainError", "source\ExplainError\ExplainError.csproj", "{2417259E-803F-4017-A3B4-5F3C87470D2E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConcurrentHoudini", "source\ConcurrentHoudini\ConcurrentHoudini.csproj", "{529AC312-BB91-4154-8BA3-7CA8743E0434}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HoudiniLite", "source\HoudiniLite\HoudiniLite.csproj", "{B5007B19-6D3A-4746-B5FF-B60F679C8A01}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "boogie", "boogie", "{247E7FAB-27D9-4AE7-9240-C421725A9B8A}"
@@ -418,54 +416,6 @@ Global
 		{2417259E-803F-4017-A3B4-5F3C87470D2E}.z3apidebug|Mixed Platforms.Build.0 = Release|Any CPU
 		{2417259E-803F-4017-A3B4-5F3C87470D2E}.z3apidebug|x86.ActiveCfg = Release|Any CPU
 		{2417259E-803F-4017-A3B4-5F3C87470D2E}.z3apidebug|x86.Build.0 = Release|Any CPU
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|.NET.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|.NET.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|Any CPU.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|Any CPU.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|Mixed Platforms.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|Mixed Platforms.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|x86.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Checked|x86.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Debug|.NET.ActiveCfg = Debug|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Debug|x86.ActiveCfg = Debug|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Debug|x86.Build.0 = Debug|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.HWSW|.NET.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.HWSW|Any CPU.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.HWSW|Mixed Platforms.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.HWSW|Mixed Platforms.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.HWSW|x86.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.HWSW|x86.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Internal|.NET.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Internal|Any CPU.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Internal|Mixed Platforms.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Internal|Mixed Platforms.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Internal|x86.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Internal|x86.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|.NET.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|.NET.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|Any CPU.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|Any CPU.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|Mixed Platforms.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|Mixed Platforms.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|x86.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.QED|x86.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Release|.NET.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Release|Any CPU.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Release|Mixed Platforms.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Release|x86.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.Release|x86.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|.NET.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|.NET.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|Any CPU.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|Any CPU.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|Mixed Platforms.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|Mixed Platforms.Build.0 = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|x86.ActiveCfg = Release|x86
-		{529AC312-BB91-4154-8BA3-7CA8743E0434}.z3apidebug|x86.Build.0 = Release|x86
 		{B5007B19-6D3A-4746-B5FF-B60F679C8A01}.Checked|.NET.ActiveCfg = Release|Any CPU
 		{B5007B19-6D3A-4746-B5FF-B60F679C8A01}.Checked|.NET.Build.0 = Release|Any CPU
 		{B5007B19-6D3A-4746-B5FF-B60F679C8A01}.Checked|Any CPU.ActiveCfg = Release|Any CPU