17 commits

Author	SHA1	Message	Date
Vincent Laporte	9c87884fdf	merlin: 2.5.2 -> 2.5.3	2016-12-01 20:14:26 +00:00
Vincent Laporte	20486458e6	ocamlPackages.merlin: 2.5.1 -> 2.5.2	2016-11-21 19:17:16 +01:00
Vincent Laporte	b7b1e42ea4	ocamlPackages.merlin: 2.5.0 -> 2.5.1	2016-10-23 14:49:17 +02:00
Théophane Hufschmitt	7bb3a04064	ocamlPackages.merlin : 2.3.1 -> 2.5.0 ... For ocaml > 4.02 only	2016-08-04 14:44:33 +02:00
Vincent Laporte	6a622acc87	merlin: 2.3 -> 2.3.1	2015-11-28 10:42:08 +01:00
Vincent Laporte	7cb6dbc3d0	merlin: 2.2 -> 2.3	2015-10-29 21:35:41 +01:00
Vincent Laporte	142400b8d5	ocaml-merlin: update from 2.1.2 to 2.2	2015-06-06 17:42:24 +02:00
Vincent Laporte	07536bd1fe	merlin: update from 2.1.1 to 2.1.2	2015-03-09 12:07:08 +01:00
Vincent Laporte	db75b5d052	merlin: update from 2.1 to 2.1.1	2015-01-29 08:43:15 +01:00
Vincent Laporte	763b2a7718	merlin: update from 2.0 to 2.1	2015-01-19 12:07:00 +01:00
Vincent Laporte	68b959d655	merlin: update from 1.7.1 to 2.0 ... Also adds an option to compile the emacs mode at install time.	2014-11-03 13:41:46 +00:00
Vincent Laporte	857c13e1af	Minor modifications of some ocaml packages: ... adds myself as a maintainer adds assertions to have evaluation errors rather than build errors moves opam out of ocamlPackages, as it does not provide a library	2014-09-21 11:02:55 +01:00
Mateusz Kowalczyk	7e5d0ee0c3	s/dependancy/dependency/	2014-09-10 00:28:49 +01:00
Vincent Laporte	e2db82874c	Updates merlin to 1.7.1	2014-08-22 14:56:33 +02:00
Vincent Laporte	e8d2f8f109	merlin: update to 1.7	2014-08-19 18:43:41 +02:00
Vincent Laporte	81f258e7bf	merlin: some cleaning of the derivation	2014-08-01 09:42:37 +02:00
Vincent Laporte	f16124d521	Adds merlin ... Merlin is an editor-independant tool to ease the developpement of programs in OCaml. It aims to provide features available in modern IDEs. Homepage: http://the-lambda-church.github.io/merlin/	2014-07-05 17:33:55 +02:00