diff options
| author | Maxime Dénès | 2015-01-15 13:44:42 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2015-01-15 13:44:42 +0100 |
| commit | 17b127167f82d5c8ebf998f0c6d946870c1322aa (patch) | |
| tree | 2b1ce15cb1ec87c444e99e3af4390d02da1f1778 /kernel/nativecode.mli | |
| parent | 25ff4164eff11d09c1147a8174f5714d3a31bbd3 (diff) | |
| parent | 93fa642fa5e4134d034a1f10fe6dffa4a36182cf (diff) | |
Merge branch 'v8.5' into trunk
Conflicts:
tools/coq_makefile.ml
Diffstat (limited to 'kernel/nativecode.mli')
0 files changed, 0 insertions, 0 deletions