Skip to content

Commit

Permalink
fix cmt magic number, update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
trefis committed Oct 9, 2018
1 parent f1918c2 commit 6669335
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
merlin 3.2.2
============
Tue Oct 9 11:25:12 BST 2018

Update cmt magic number for 4.07.1

merlin 3.2.1
============
Mon Oct 8 11:44:16 BST 2018

Fix build on OCaml 4.02 to 4.04

merlin 3.2.0
============
Mon Oct 8 10:41:24 BST 2018
Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/utils/407/config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ and ast_impl_magic_number = "Caml1999M023"
and ast_intf_magic_number = "Caml1999N023"
and cmxs_magic_number = "Caml1999D023"
(* cmxs_magic_number is duplicated in otherlibs/dynlink/natdynlink.ml *)
and cmt_magic_number = "Caml1999T023"
and cmt_magic_number = "Caml1999T024"

let load_path = ref ([] : string list)

Expand Down

0 comments on commit 6669335

Please sign in to comment.