diff options
| author | lmamane | 2007-01-10 17:13:30 +0000 |
|---|---|---|
| committer | lmamane | 2007-01-10 17:13:30 +0000 |
| commit | 504ab5e2aeb2b204c3ba1d6f4af5b52e6f88b604 (patch) | |
| tree | bad714a901cc0b82bb725f43dccd2b81ab209bd2 /kernel | |
| parent | bce104e3bb510fb10df2ecddebb47514328f2b8d (diff) | |
Merge with Lionel Elie Mamane's private branch:
- Fix previous merge (semantic/type conflict in code added minutes
before my commit).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9477 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions