aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMatthieu Sozeau2014-06-26 12:22:00 +0200
committerMatthieu Sozeau2014-06-26 12:22:00 +0200
commita8042c49ec2d49feb0d08630f758c6690297fbe6 (patch)
tree4a7f82637db72156e6f3961c209392554954edcc /kernel
parentca9092775ac61be80071f6b12f6e40701c118129 (diff)
parent75940a69b0151191ded0ff153ec5490436786faa (diff)
Merge branch 'more-test-suite' of https://github.com/JasonGross/coq into JasonGross-more-test-suite
Conflicts: test-suite/bugs/closed/3300.v test-suite/bugs/closed/3373.v
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions