[Pkg-ocaml-maint-commits] [js-of-ocaml] 02/15: Merge tag 'upstream/2.3'

Mehdi Dogguy mehdi at moszumanska.debian.org
Sun Oct 18 08:48:22 UTC 2015


This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository js-of-ocaml.

commit b991b0666581b97db397cd8068ba01f55f44c35c
Merge: 7901a92 0019b41
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Oct 18 09:51:52 2015 +0200

    Merge tag 'upstream/2.3'
    
    Upstream version 2.3

 .gitignore                                         |    13 +
 .jenkins.sh                                        |     4 +
 CHANGES                                            |    18 +
 Makefile.conf                                      |    11 +-
 Makefile.filelist                                  |    14 +-
 VERSION                                            |     2 +-
 compiler/Makefile                                  |    12 +-
 compiler/generate.ml                               |    11 +-
 compiler/js_parser.mly                             |    16 +-
 doc/Makefile                                       |    22 +-
 doc/api-index                                      |    15 +-
 doc/api.odocl                                      |     7 +-
 doc/manual-aux/boulderdash/boulderdash.js          |  1391 -
 doc/manual-aux/boulderdash/index.html              |    12 -
 doc/manual-aux/boulderdash/sprites/D.png           |   Bin 433 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/L.png           |   Bin 423 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/R.png           |   Bin 435 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/U.png           |   Bin 417 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/bD.png          |   Bin 1038 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/bL.png          |   Bin 1024 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/bR.png          |   Bin 1039 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/bU.png          |   Bin 1052 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/bam.png         |   Bin 1015 -> 0 bytes
 .../boulderdash/sprites/blue_diamond.png           |   Bin 1007 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/bomb.png        |   Bin 980 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/boulder.png     |   Bin 959 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/diamond.png     |   Bin 1093 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/door.png        |   Bin 341 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/empty.png       |   Bin 164 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/end.png         |   Bin 642 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/grass.png       |   Bin 745 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/guy.png         |   Bin 633 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/push_l.png      |   Bin 640 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/push_r.png      |   Bin 619 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/red_diamond.png |   Bin 918 -> 0 bytes
 doc/manual-aux/boulderdash/sprites/scalable.svg    |   974 -
 doc/manual-aux/boulderdash/sprites/wall.png        |   Bin 309 -> 0 bytes
 doc/manual-aux/cubes/cubes.js                      |   989 -
 doc/manual-aux/cubes/index.html                    |    11 -
 doc/manual-aux/graph_viewer/index.html             |    11 -
 doc/manual-aux/graph_viewer/jsviewer.js            |  1532 -
 doc/manual-aux/hyperbolic/hypertree.js             |  1718 --
 doc/manual-aux/hyperbolic/icons/commons-38.png     |   Bin 2075 -> 0 bytes
 doc/manual-aux/hyperbolic/icons/favicon.png        |   Bin 688 -> 0 bytes
 doc/manual-aux/hyperbolic/icons/globe-38.png       |   Bin 2901 -> 0 bytes
 doc/manual-aux/hyperbolic/icons/info-38.png        |   Bin 806 -> 0 bytes
 .../hyperbolic/icons/meeting-point-38.png          |   Bin 1105 -> 0 bytes
 doc/manual-aux/hyperbolic/icons/wikipedia-38.png   |   Bin 3530 -> 0 bytes
 doc/manual-aux/hyperbolic/index.html               |    84 -
 doc/manual-aux/minesweeper/index.html              |    13 -
 doc/manual-aux/minesweeper/minesweeper.js          |   437 -
 doc/manual-aux/minesweeper/sprites/1.png           |   Bin 576 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/2.png           |   Bin 714 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/3.png           |   Bin 718 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/4.png           |   Bin 650 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/5.png           |   Bin 698 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/6.png           |   Bin 764 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/7.png           |   Bin 620 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/8.png           |   Bin 802 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/bomb.png        |   Bin 1090 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/empty.png       |   Bin 403 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/flag.png        |   Bin 735 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/normal.png      |   Bin 434 -> 0 bytes
 doc/manual-aux/minesweeper/sprites/scalable.svg    |   301 -
 doc/manual-aux/planet/index.html                   |    20 -
 doc/manual-aux/planet/planet.js                    |  1061 -
 doc/manual-aux/planet/texture.jpg                  |   Bin 94262 -> 0 bytes
 doc/manual-aux/toplevel/index.html                 |   177 -
 doc/manual-aux/toplevel/toplevel.js                | 29183 -------------------
 doc/manual-aux/webgl/index.html                    |    51 -
 doc/manual-aux/webgl/webgldemo.js                  |  1337 -
 doc/manual-aux/wiki/index.html                     |    12 -
 doc/manual-aux/wiki/wiki.js                        |  1125 -
 doc/manual-aux/wysiwyg/index.html                  |    12 -
 doc/manual-aux/wysiwyg/wiki.js                     |   949 -
 doc/manual-wiki/library.wiki                       |     4 +-
 doc/manual-wiki/ocamlbuild.wiki                    |     2 +-
 doc/manual-wiki/overview.wiki                      |     2 +-
 lib/.depend                                        |    13 +-
 lib/META                                           |    28 +-
 lib/Makefile                                       |    69 +-
 lib/dom_html.ml                                    |    57 +-
 lib/dom_html.mli                                   |    62 +-
 lib/event_arrows.ml                                |   174 -
 lib/event_arrows.mli                               |   126 -
 lib/form.ml                                        |     2 +-
 lib/log/lwt_log_js.ml                              |    99 +
 lib/log/lwt_log_js.mli                             |    98 +
 lib/tyxml/tyxml_cast.ml                            |   199 +
 lib/tyxml/tyxml_cast.mli                           |    26 +
 lib/tyxml/tyxml_cast_sigs.mli                      |   195 +
 lib/tyxml/tyxml_js.ml                              |   249 +
 lib/tyxml/tyxml_js.mli                             |    67 +
 opam/opam => opam                                  |    10 +-
 opam/descr                                         |     1 -
 opam/url                                           |     1 -
 runtime/jslib_js_of_ocaml.js                       |     2 +-
 runtime/marshal.js                                 |     2 +-
 tests/dir/side_effect.ml                           |    23 +
 toplevel/Makefile                                  |    18 +-
 toplevel/toplevel.ml                               |    33 +-
 101 files changed, 1304 insertions(+), 41803 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/js-of-ocaml.git



More information about the Pkg-ocaml-maint-commits mailing list