summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Some fixes, in particular for Windows.flambda_trunkalainfrisch2015-12-015-7/+12
* compilation fixMark Shinwell2015-11-301-1/+1
* mergeMark Shinwell2015-11-3023-99/+615
|\
| * Fix for commit 9229b1Jacques Garrigue2015-12-011-0/+4
| * Merge pull request #286 from garrigue/ocamldep-modaliasJacques Garrigue2015-12-0122-98/+610
| |\
| | * update documentation for ocamldepJacques Garrigue2015-12-012-0/+103
| | * add module alias support to ocamldepJacques Garrigue2015-12-0120-98/+507
| |/
* | Merge remote-tracking branch 'ocaml/trunk' into flambda_trunkMark Shinwell2015-11-309-117/+112
|\ \ | |/
| * Promote 'let module' to core language.Alain Frisch2015-11-302-27/+20
| * Lazy expressions promoted to core language.Alain Frisch2015-11-303-21/+15
| * Promote 'assert' to core language.Alain Frisch2015-11-302-30/+29
| * PR#6676: range patterns are now considered part of the core language.Alain Frisch2015-11-302-20/+13
| * PR#6676: remove section on stream syntax (removed in OCaml 3.03).Alain Frisch2015-11-301-15/+0
| * Fix PR#6920Jeremie Dimino2015-11-306-4/+35
* | fix Invariant_params (fixes Coq compilation) and tidy up a bitMark Shinwell2015-11-303-75/+68
* | merge with trunkMark Shinwell2015-11-304-151/+159
* | Merge remote-tracking branch 'ocaml/trunk' into flambda_trunkMark Shinwell2015-11-301-2/+1
|\ \ | |/
| * Someone didn't compile their codeMark Shinwell2015-11-301-2/+1
* | mergeMark Shinwell2015-11-30190-184/+24660
|\ \ | |/
| * GPR#210: runtime warnings are disabled by default.alainfrisch2015-11-302-2/+3
| * GPR#210: keep unflushed out channels around to be able to flush them during a...alainfrisch2015-11-301-3/+23
| * Fix PR#6946Jacques Garrigue2015-11-305-3/+28
| * update explanation of variance annotations, following PR#7055Jacques Garrigue2015-11-301-2/+4
| * Fix PR#6981Jacques Garrigue2015-11-303-0/+12
| * Fix PR#6980 and remove unused Ctype.iterative_generalizationJacques Garrigue2015-11-305-27/+40
| * Merge pull request #313 from chambart/quadratic_behavior_in_CSEGabriel Scherer2015-11-292-21/+51
| |\
| | * Update ChangesPierre Chambart2015-11-281-0/+2
| | * Prevent quadratic cases in CSEPierre Chambart2015-11-261-21/+49
| * | bootstrapGabriel Scherer2015-11-293-0/+0
| * | Merge pull request #318 from Octachron/manual_deprecated_fixGabriel Scherer2015-11-292-10/+10
| |\ \
| | * | manual: improve the string class exampleoctachron2015-11-291-7/+7
| | * | manual: revert "specialized byte array" additionoctachron2015-11-291-7/+7
| | * | manual: distinguish bytes array and stringoctachron2015-11-292-11/+11
| | * | manual: Fix deprecated use of Array.createoctachron2015-11-291-2/+2
| |/ /
| * | manual: Changes entryGabriel Scherer2015-11-291-0/+6
| * | manual/ add LICENSE file extracted from manual/foreword.etexGabriel Scherer2015-11-291-0/+9
| * | manual build: have 'make all' run 'make tools' firstGabriel Scherer2015-11-292-7/+4
| * | Merge pull request #302 from bobot/add_ocaml_manualsGabriel Scherer2015-11-29144-0/+23978
| |\ \
| | * | Some current shortcoming of the manual compilationFrançois Bobot2015-11-231-0/+2
| | * | Simplify a little the build of the manualFrançois Bobot2015-11-202-71/+46
| | * | Merge the history of the ocaml manual (in svn it was `ocamldoc/`) into the on...François Bobot2015-11-20144-0/+24001
| | |\ \
| | | * | ocamllex: refill continuation only takes lexbuf as argumentGabriel Scherer2015-10-211-2/+2
| | | * | Initial doc for [@unboxed], [@untagged] and [@noalloc]Jérémie Dimino2015-10-131-0/+135
| | | * | State the intent of Invalid_argument, Failure, and Sys_errorGabriel Scherer2015-10-031-5/+14
| | | * | GPR#12: Minor update of ";;" description in 6.11.2Damien Doligez2015-09-111-7/+6
| | | * | minor: wrap long lines for consistencyGabriel Scherer2015-07-141-26/+75
| | | * | PR#6912: Alternative description for nonrecGabriel Scherer2015-07-141-5/+5
| | | * | PR#6912: add missing nonrec keywordGabriel Scherer2015-07-141-1/+1
| | | * | PR#6912: document #.. operatorsGabriel Scherer2015-07-143-1/+12
| | | * | Update exten.etexGabriel Scherer2015-06-301-1/+1