Merge branch 'master' into gen_proofmode

281f58fe · Jacques-Henri Jourdan · 5d6b3364 · 76d99d52 · 281f58fe
Commit 281f58fe authored Dec 04, 2017 by Jacques-Henri Jourdan
--- a/opam
+++ b/opam
@@ -11,5 +11,5 @@ install: [make "install"]
 remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris"]
 depends: [
  "coq" { >= "8.7.dev" & < "8.8~" | (= "dev") }
-  "coq-stdpp" { (= "dev.2017-11-29.1") | (= "dev") }
+  "coq-stdpp" { (= "dev.2017-12-04.0") | (= "dev") }
 ]