diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-06 12:51:42 +0200 |
| commit | e30aa60a06817ed67c14a80430a7275defc41e76 (patch) | |
| tree | b4bb512416a40578db1f32eb3a7836ddb6f8582d /.gitignore | |
| parent | aa780c7145a418b4a7264e828258034fc4629313 (diff) | |
| parent | 2f31c1867b75040067a1ef74ae32f197e8d296c1 (diff) | |
| download | compcert-e30aa60a06817ed67c14a80430a7275defc41e76.tar.gz compcert-e30aa60a06817ed67c14a80430a7275defc41e76.zip | |
Merge branch 'master' into json_export
Conflicts:
driver/Driver.ml
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -41,9 +41,9 @@ cparser/pre_parser.ml cparser/pre_parser.mli lib/Readconfig.ml lib/Tokenize.ml +driver/Version.ml # Documentation doc/coq2html doc/coq2html.ml doc/html doc/html/ - |