summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2015-12-09 11:14:23 +0100
committerXavier Leroy <xavier.leroy@inria.fr>2015-12-09 11:14:23 +0100
commitbe4381dddf9f32282488f4eddde7af56794c8ed1 (patch)
tree33c1f14e0d77340e75fcc115a0ad108b85de03a2 /boot
parent281076376423eccea65a11973f0eef0e60c55fbb (diff)
downloadocaml-be4381dddf9f32282488f4eddde7af56794c8ed1.tar.gz
When copying the new compilers to boot/, also strip the #! header. It is not needed and can cause spurious merge conflicts.
Diffstat (limited to 'boot')
-rwxr-xr-xboot/ocamlcbin1918776 -> 1918738 bytes
-rwxr-xr-xboot/ocamldepbin589136 -> 589098 bytes
-rwxr-xr-xboot/ocamllexbin263346 -> 263308 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/boot/ocamlc b/boot/ocamlc
index 050f760b4d..60b4364878 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
Binary files differ
diff --git a/boot/ocamldep b/boot/ocamldep
index 701c67a00d..b422042c2e 100755
--- a/boot/ocamldep
+++ b/boot/ocamldep
Binary files differ
diff --git a/boot/ocamllex b/boot/ocamllex
index 17b05575e3..a3d4d0b658 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
Binary files differ