diff options
| author | msozeau | 2011-05-05 11:36:22 +0000 |
|---|---|---|
| committer | msozeau | 2011-05-05 11:36:22 +0000 |
| commit | ce36fb68500966c9eed8f54943f62d8b31edda5c (patch) | |
| tree | e7c5788a2bc8b7a647ee30e58eb0e6a63971e87e /plugins/syntax | |
| parent | be299971b29dbed7837c497fd59c192e4d0add72 (diff) | |
Merge branch 'subclasses' into coq-trunk
Stop using hnf_constr in unify_type, which might unfold constants
that are marked opaque for unification.
Conflicts:
pretyping/unification.ml
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14092 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'plugins/syntax')
0 files changed, 0 insertions, 0 deletions