diff --git a/.gitignore b/.gitignore index c8aefda9225..1cf08babd59 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,5 @@ doc/dev-manual/*.out doc/pages/*.html doc/*.build src/x_build_libs.ocp +# dev setup +/.ocamlinit diff --git a/.ocamlinit b/admin-scripts/ocamlinit similarity index 100% rename from .ocamlinit rename to admin-scripts/ocamlinit diff --git a/master_changes.md b/master_changes.md index a0cd2983f97..5e31690e897 100644 --- a/master_changes.md +++ b/master_changes.md @@ -378,6 +378,7 @@ users) * Always open files with `O_SHARE_DELETE`, which eliminates unnecessary "access denied" errors in various situations on Windows. [#5435 @dra27] * Ensure the cwd is restored when launching a process fails [#5441 @dra27] * Fix linting on opam-crowbar.opam [#5507 @kit-ty-kate] + * Move the .ocamlinit script out of the root directory [#5526 @kit-ty-kate] ## Internal: Windows * Support MSYS2: treat MSYS2 and Cygwin as equivalent [#4813 @jonahbeckford]