summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2012-07-26 19:21:54 +0000
committerDamien Doligez <damien.doligez-inria.fr>2012-07-26 19:21:54 +0000
commit0c3a7de5079529bc99cbc9e68806f1a7021d94ef (patch)
tree3b973b6db6313c9bb2993b77c925c0dc8b457f7a /boot
parent229044d83a940d855fd9590d9aa76596f8c1a8b9 (diff)
downloadocaml-0c3a7de5079529bc99cbc9e68806f1a7021d94ef.tar.gz
merge changes from 4.00 branching to 4.00.0 (part 1)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'boot')
-rw-r--r--boot/.ignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/boot/.ignore b/boot/.ignore
index a0a2356c9a..8165156d9a 100644
--- a/boot/.ignore
+++ b/boot/.ignore
@@ -1,6 +1,8 @@
Saved
ocamlrun
+ocamlrun.exe
ocamlyacc
+ocamlyacc.exe
camlheader
myocamlbuild
myocamlbuild.native