Merge branch 'master' of https://github.com/boogie-org/boogie

Conflicts:
	Source/Core/CommandLineOptions.cs
	Source/ExecutionEngine/ExecutionEngine.cs
	Source/ExecutionEngine/VerificationResultCache.cs
	Source/VCGeneration/VC.cs
	Test/snapshots/runtest.snapshot
	Test/snapshots/runtest.snapshot.expect

1 files changed, 15 insertions, 15 deletions

diff --git a/Test/z3api/boog31.bpl b/Test/z3api/boog31.bpl
index 86386a90..ca195c74 100644
--- a/Test/z3api/boog31.bpl
+++ b/Test/z3api/boog31.bpl
@@ -1,15 +1,15 @@
-type ref;

-

-const b1:bool;

-const b2:bool;

-const b3:bool;

-

-axiom (b1==true && b2==false && b3==true);

-

-procedure  main ( ) 

-

-{

-var c: int;

-assert (c==0);

-}

-

+type ref;
+
+const b1:bool;
+const b2:bool;
+const b3:bool;
+
+axiom (b1==true && b2==false && b3==true);
+
+procedure  main ( ) 
+
+{
+var c: int;
+assert (c==0);
+}
+