diff options
| author | Pierre-Marie Pédrot | 2015-11-20 11:27:45 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2015-11-20 11:27:45 +0100 |
| commit | f01b73bd6f5a66cde730c584df6be08e06bf2042 (patch) | |
| tree | 294b074f4752fdb39f24ea4e2f55349558e9db26 /engine/evd.mli | |
| parent | 5ccadc40d54090df5e6b61b4ecbb6083d01e5a88 (diff) | |
| parent | 574e510ba069f1747ecb1e5a17cf86c902d79d44 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'engine/evd.mli')
| -rw-r--r-- | engine/evd.mli | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/evd.mli b/engine/evd.mli index 25d8a8c3d2..57399f2b5e 100644 --- a/engine/evd.mli +++ b/engine/evd.mli @@ -448,7 +448,7 @@ val meta_reassign : metavariable -> constr * instance_status -> evar_map -> eva val clear_metas : evar_map -> evar_map (** [meta_merge evd1 evd2] returns [evd2] extended with the metas of [evd1] *) -val meta_merge : evar_map -> evar_map -> evar_map +val meta_merge : ?with_univs:bool -> evar_map -> evar_map -> evar_map val undefined_metas : evar_map -> metavariable list val map_metas_fvalue : (constr -> constr) -> evar_map -> evar_map |