diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
| commit | 81e91f965e7b1afbea8d1630015e75f11f0a3afd (patch) | |
| tree | 270a85299f33d783e33745c917796f080f7300e1 /.gitignore | |
| parent | 3304820b870e4524c7d1f14fcd62506634f7922b (diff) | |
| parent | 06841a5bb7ca27bc436e87e7991d0d05dbf5267c (diff) | |
| download | compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.tar.gz compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -19,10 +19,10 @@ cchecklink.byte clightgen clightgen.byte tools/ndfun +tools/modorder Makefile.config -# ocamlbuild's temp dir -_build/ # Generated files +.depend.extr compcert.ini ia32/ConstpropOp.v ia32/SelectOp.v @@ -32,6 +32,14 @@ arm/ConstpropOp.v arm/SelectOp.v backend/SelectDiv.v backend/SelectLong.v +backend/CMlexer.ml +backend/CMparser.ml +backend/CMparser.mli +cparser/Parser.v +cparser/Lexer.ml +cparser/pre_parser.ml +cparser/pre_parser.mli +lib/Tokenize.ml # Documentation doc/coq2html doc/coq2html.ml |