aboutsummaryrefslogtreecommitdiffhomepage
path: root/.merlin
Commit message (Expand)AuthorAge
* Merge branch 'trunk' into located_switchGravatar Emilio Jesus Gallego Arias2017-05-24
|\
| * Enable more warnings, and add -warn-error configure flagGravatar Gaetan Gilbert2017-04-27
* | [location] Remove Loc.ghost.Gravatar Emilio Jesus Gallego Arias2017-04-25
|/
* [camlpX] Remove camlp4 compat layer.Gravatar Emilio Jesus Gallego Arias2017-04-07
* [safe-string] Enable -safe-string !Gravatar Emilio Jesus Gallego Arias2017-03-14
* [stm] Break stm/toplevel dependency loop.Gravatar Emilio Jesus Gallego Arias2017-02-15
* Merge branch 'v8.6'Gravatar Pierre-Marie Pédrot2016-12-07
|\
| * [merlin] Adjust merlin for ide.Gravatar Emilio Jesus Gallego Arias2016-11-30
* | updating ".merlin" fileGravatar Matej Kosik2016-11-03
|/
* [merlin] Fix .merlin STM includes.Gravatar Emilio Jesus Gallego Arias2016-06-25
* Adding a new folder corresponding to the low-level part of the pretyperGravatar Pierre-Marie Pédrot2015-02-27
* Clean up the .merlinGravatar Thomas Refis2014-04-03
* Fixup make clean and .merlinGravatar Pierre Boutillier2014-01-18
* 'Pretty' printer for wf_pathsGravatar Pierre2014-01-11
* Goodbye typerex, Hello merlinGravatar Pierre2014-01-09