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

diff --git a/Test/snapshots/Snapshots0.v0.bpl b/Test/snapshots/Snapshots0.v0.bpl
index c75e9520..68143cdf 100644
--- a/Test/snapshots/Snapshots0.v0.bpl
+++ b/Test/snapshots/Snapshots0.v0.bpl
@@ -1,42 +1,42 @@
-// id = "P1:0"

-// priority = 3

-// checksum = "123"

-// 

-// Action: verify

-procedure {:priority 3} {:checksum "123"} P1()

-{

-    assert false;

-}

-

-

-// id = "P2:0"

-// priority = 3

-// checksum = null

-//

-// Action: verify

-procedure {:priority 3} P2()

-{

-    assert false;

-}

-

-

-// id = "P3:0"

-// priority = 1

-// checksum = null

-//

-// Action: verify

-procedure P3()

-{

-    assert false;

-}

-

-

-// id = "P0:1"

-// priority = 5

-// checksum = "012"

-//

-// Action: verify

-procedure {:id "P0:1"} {:priority 5} {:checksum "012"} P0()

-{

-    assert false;

-}

+// id = "P1:0"
+// priority = 3
+// checksum = "123"
+// 
+// Action: verify
+procedure {:priority 3} {:checksum "123"} P1()
+{
+    assert false;
+}
+
+
+// id = "P2:0"
+// priority = 3
+// checksum = null
+//
+// Action: verify
+procedure {:priority 3} P2()
+{
+    assert false;
+}
+
+
+// id = "P3:0"
+// priority = 1
+// checksum = null
+//
+// Action: verify
+procedure P3()
+{
+    assert false;
+}
+
+
+// id = "P0:1"
+// priority = 5
+// checksum = "012"
+//
+// Action: verify
+procedure {:id "P0:1"} {:priority 5} {:checksum "012"} P0()
+{
+    assert false;
+}