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

glondu pushed a commit to branch master
in repository lablgl.

commit 8393a12e1000711d674b8e6ad21ae1fd8fb65ac4
Merge: 2c2bad5 4cda21f
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Dec 13 15:53:20 2013 +0100

    Merge tag 'upstream/1.05'
    
    Upstream version 1.05

 CHANGES                                          |   15 +
 LablGlut/examples/etc/draw2d.ml                  |  118 -
 LablGlut/examples/etc/in-progress/scene_graph.ml |  170 -
 LablGlut/src/Makefile                            |    3 +-
 LablGlut/src/wrap_glut.c                         |    1 +
 META                                             |   19 +
 Makefile.common                                  |    1 +
 Makefile.config.ex                               |    5 +
 Makefile.config.mingw                            |   15 +-
 Makefile.config.msvc                             |    5 +
 Makefile.config.osx                              |   16 +-
 Makefile.config.ex => Makefile.config.ubuntu     |   21 +-
 README                                           |   24 +-
 Togl/src/Makefile                                |   16 +-
 Togl/src/Togl/LICENSE                            |    2 +-
 Togl/src/Togl/Makefile                           |  200 -
 Togl/src/Togl/README                             |  570 ---
 Togl/src/Togl/Togl.html                          | 1966 ++++----
 Togl/src/Togl/WinMain.c                          |  155 -
 Togl/src/Togl/WinMain2.c                         |  268 -
 Togl/src/Togl/double.c                           |  450 +-
 Togl/src/Togl/double.tcl                         |   19 +-
 Togl/src/Togl/gears.c                            |  670 ++-
 Togl/src/Togl/gears.tcl                          |    7 +-
 Togl/src/Togl/image.c                            |  248 +-
 Togl/src/Togl/image.h                            |   12 +-
 Togl/src/Togl/index.c                            |  289 +-
 Togl/src/Togl/index.tcl                          |   18 +-
 Togl/src/Togl/overlay.c                          |  285 +-
 Togl/src/Togl/overlay.tcl                        |   18 +-
 Togl/src/Togl/stereo.c                           |  551 +--
 Togl/src/Togl/stereo.tcl                         |   26 +-
 Togl/src/Togl/texture.c                          |  922 ++--
 Togl/src/Togl/texture.tcl                        |   18 +-
 Togl/src/Togl/tkConsole.c                        |  615 ---
 Togl/src/Togl/tkFont.h                           |  174 +-
 Togl/src/Togl/tkInt4.0.h                         |  728 ---
 Togl/src/Togl/tkInt4.1.h                         |  809 ---
 Togl/src/Togl/tkInt4.2.h                         |  854 ----
 Togl/src/Togl/tkInt8.0.h                         |  992 ----
 Togl/src/Togl/tkInt8.0p2.h                       |  990 ----
 Togl/src/Togl/tkInt8.1.h                         | 1009 ----
 Togl/src/Togl/tkInt8.2.h                         | 1009 ----
 Togl/src/Togl/tkInt8.3.h                         | 1087 ----
 Togl/src/Togl/tkInt8.4.h                         | 1177 -----
 Togl/src/Togl/tkInt8.5.h                         | 1223 -----
 Togl/src/Togl/tkIntDecls8.1.h                    | 1183 -----
 Togl/src/Togl/tkIntDecls8.2.h                    | 1460 ------
 Togl/src/Togl/tkIntDecls8.3.h                    | 1476 ------
 Togl/src/Togl/tkIntDecls8.4.h                    | 1547 ------
 Togl/src/Togl/tkIntDecls8.5.h                    | 1908 -------
 Togl/src/Togl/tkPort.h                           |   36 -
 Togl/src/Togl/tkWin.h                            |   56 -
 Togl/src/Togl/tkWinInt.h                         |  197 -
 Togl/src/Togl/tkWinPort.h                        |  120 -
 Togl/src/Togl/togl.c                             | 5727 +++++++++++++---------
 Togl/src/Togl/togl.h                             |  421 +-
 Togl/src/togl.ml                                 |    6 +-
 lablGL.spec                                      |   76 -
 src/Makefile                                     |    8 +-
 src/ml_shader.c                                  |    3 +-
 61 files changed, 6406 insertions(+), 25608 deletions(-)

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to