aboutsummaryrefslogtreecommitdiff
path: root/kernel/inductive.ml
diff options
context:
space:
mode:
authorEnrico Tassi2016-06-14 16:11:40 +0200
committerEnrico Tassi2016-06-14 16:11:40 +0200
commit4782d1f9e7679f2a5cbf4fa487ecb4708e7683f6 (patch)
tree0dde487ef008f89ced86cad7fb4cb1d04c238e26 /kernel/inductive.ml
parenta1eeb3abe387a89cd5a9108160643b6157f9c0af (diff)
parent6c510a0d145d41e7250f121bfd01e0251e41af2c (diff)
Merge remote-tracking branch 'origin/pr/146' into trunk
Conflicts: Makefile.common
Diffstat (limited to 'kernel/inductive.ml')
0 files changed, 0 insertions, 0 deletions