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, 24 insertions, 24 deletions

diff --git a/Test/z3api/boog6.bpl b/Test/z3api/boog6.bpl
index f6c3c23f..05a63440 100644
--- a/Test/z3api/boog6.bpl
+++ b/Test/z3api/boog6.bpl
@@ -1,24 +1,24 @@
-type ref;

-// types

-type Wicket;

-

-// consts

-var favorite: Wicket;

-

-// axioms

-const b: bool;

-axiom b==true;

-

-// procedure

-procedure SetToSeven(p: Wicket);

-  modifies favorite

-;

-

-  ensures favorite==p;

-

-implementation SetToSeven(l: Wicket) {

-  favorite:=l;

-}

-

-

-

+type ref;
+// types
+type Wicket;
+
+// consts
+var favorite: Wicket;
+
+// axioms
+const b: bool;
+axiom b==true;
+
+// procedure
+procedure SetToSeven(p: Wicket);
+  modifies favorite
+;
+
+  ensures favorite==p;
+
+implementation SetToSeven(l: Wicket) {
+  favorite:=l;
+}
+
+
+