[ovito] 01/07: Merge tag 'upstream/2.3.3+dfsg1'

Anton Gladky gladk at moszumanska.debian.org
Mon Jun 29 22:00:37 UTC 2015


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

gladk pushed a commit to branch master
in repository ovito.

commit e6b2810f3580d72703e4592baf326d6c19e2b065
Merge: ca533cc 0e73121
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jun 29 22:24:47 2015 +0200

    Merge tag 'upstream/2.3.3+dfsg1'
    
    Upstream version 2.3.3+dfsg1

 src/3rdparty/botan/botan.pri                   |     2 -
 src/3rdparty/botan/botan.qbs                   |    70 -
 src/3rdparty/botan/botan/botan.cpp             | 47184 -----------------------
 src/3rdparty/botan/botan/botan.h               | 16188 --------
 src/3rdparty/botan/botan/cbc.h                 |     1 -
 src/3rdparty/botan/botan/der_enc.h             |     1 -
 src/3rdparty/botan/botan/dh.h                  |     1 -
 src/3rdparty/botan/botan/dl_group.h            |     1 -
 src/3rdparty/botan/botan/dsa.h                 |     1 -
 src/3rdparty/botan/botan/hmac.h                |     1 -
 src/3rdparty/botan/botan/pem.h                 |     1 -
 src/3rdparty/botan/botan/pk_filts.h            |     1 -
 src/3rdparty/botan/botan/pkcs8.h               |     1 -
 src/3rdparty/botan/botan/pubkey.h              |     1 -
 src/3rdparty/botan/botan/rsa.h                 |     1 -
 src/3rdparty/botan/botan/ui.h                  |     1 -
 src/3rdparty/botan/configure.py                |  1881 -
 src/3rdparty/botan/doc/license.txt             |    49 -
 src/3rdparty/botan/readme.txt                  |    15 -
 src/3rdparty/muparser/Changes.txt              |   531 -
 src/3rdparty/muparser/License.txt              |    35 -
 src/3rdparty/muparser/muParser.cpp             |   388 -
 src/3rdparty/muparser/muParser.h               |   114 -
 src/3rdparty/muparser/muParserBase.cpp         |  1777 -
 src/3rdparty/muparser/muParserBase.h           |   311 -
 src/3rdparty/muparser/muParserBytecode.cpp     |   588 -
 src/3rdparty/muparser/muParserBytecode.h       |   141 -
 src/3rdparty/muparser/muParserCallback.cpp     |   463 -
 src/3rdparty/muparser/muParserCallback.h       |   118 -
 src/3rdparty/muparser/muParserDLL.cpp          |  1060 -
 src/3rdparty/muparser/muParserDLL.h            |   235 -
 src/3rdparty/muparser/muParserDef.h            |   368 -
 src/3rdparty/muparser/muParserError.cpp        |   336 -
 src/3rdparty/muparser/muParserError.h          |   174 -
 src/3rdparty/muparser/muParserFixes.h          |    62 -
 src/3rdparty/muparser/muParserInt.cpp          |   280 -
 src/3rdparty/muparser/muParserInt.h            |   135 -
 src/3rdparty/muparser/muParserStack.h          |   125 -
 src/3rdparty/muparser/muParserTemplateMagic.h  |   150 -
 src/3rdparty/muparser/muParserTest.cpp         |  1450 -
 src/3rdparty/muparser/muParserTest.h           |   210 -
 src/3rdparty/muparser/muParserToken.h          |   399 -
 src/3rdparty/muparser/muParserTokenReader.cpp  |   955 -
 src/3rdparty/muparser/muParserTokenReader.h    |   161 -
 src/3rdparty/qcustomplot/GPL.txt               |   674 -
 src/3rdparty/qcustomplot/changelog.txt         |   373 -
 src/3rdparty/qcustomplot/qcustomplot.cpp       | 21370 ----------
 src/3rdparty/qcustomplot/qcustomplot.h         |  3529 --
 src/3rdparty/tachyon/.DS_Store                 |   Bin 6148 -> 0 bytes
 src/3rdparty/tachyon/Changes                   |  1135 -
 src/3rdparty/tachyon/Copyright                 |    31 -
 src/3rdparty/tachyon/README                    |   106 -
 src/3rdparty/tachyon/tachyon/.#api.c.1.158     |  1027 -
 src/3rdparty/tachyon/tachyon/.#api.c.1.164     |  1066 -
 src/3rdparty/tachyon/tachyon/.#camera.c.1.49   |   684 -
 src/3rdparty/tachyon/tachyon/.#imap.c.1.28     |   532 -
 src/3rdparty/tachyon/tachyon/.#render.c.1.109  |   467 -
 src/3rdparty/tachyon/tachyon/.#shade.c.1.104   |   704 -
 src/3rdparty/tachyon/tachyon/.#shade.c.1.70    |   428 -
 src/3rdparty/tachyon/tachyon/.#shade.c.1.84    |   562 -
 src/3rdparty/tachyon/tachyon/.#tachyon.h.1.108 |  1050 -
 src/3rdparty/tachyon/tachyon/.#tachyon.h.1.87  |   447 -
 src/3rdparty/tachyon/tachyon/.#trace.c.1.124   |   248 -
 src/3rdparty/tachyon/tachyon/.#trace.c.1.126   |   362 -
 src/3rdparty/tachyon/tachyon/.#trace.h.1.33    |    29 -
 src/3rdparty/tachyon/tachyon/.#types.h.1.117   |   365 -
 src/3rdparty/tachyon/tachyon/.DS_Store         |   Bin 6148 -> 0 bytes
 src/3rdparty/tachyon/tachyon/api.c             |  1319 -
 src/3rdparty/tachyon/tachyon/apigeom.c         |   249 -
 src/3rdparty/tachyon/tachyon/apitrigeom.c      |   186 -
 src/3rdparty/tachyon/tachyon/apitrigeom.h      |    13 -
 src/3rdparty/tachyon/tachyon/box.c             |   133 -
 src/3rdparty/tachyon/tachyon/box.h             |    19 -
 src/3rdparty/tachyon/tachyon/camera.c          |   704 -
 src/3rdparty/tachyon/tachyon/camera.h          |    29 -
 src/3rdparty/tachyon/tachyon/cone.c            |   191 -
 src/3rdparty/tachyon/tachyon/cone.h            |    30 -
 src/3rdparty/tachyon/tachyon/coordsys.c        |    54 -
 src/3rdparty/tachyon/tachyon/coordsys.h        |     9 -
 src/3rdparty/tachyon/tachyon/cylinder.c        |   251 -
 src/3rdparty/tachyon/tachyon/cylinder.h        |    30 -
 src/3rdparty/tachyon/tachyon/extvol.c          |   285 -
 src/3rdparty/tachyon/tachyon/extvol.h          |    22 -
 src/3rdparty/tachyon/tachyon/global.c          |     9 -
 src/3rdparty/tachyon/tachyon/global.h          |     9 -
 src/3rdparty/tachyon/tachyon/grid.c            |   682 -
 src/3rdparty/tachyon/tachyon/grid.h            |    70 -
 src/3rdparty/tachyon/tachyon/hash.c            |   271 -
 src/3rdparty/tachyon/tachyon/hash.h            |    40 -
 src/3rdparty/tachyon/tachyon/image.h           |    28 -
 src/3rdparty/tachyon/tachyon/imageio.c         |   408 -
 src/3rdparty/tachyon/tachyon/imageio.h         |    30 -
 src/3rdparty/tachyon/tachyon/imap.c            |   550 -
 src/3rdparty/tachyon/tachyon/imap.h            |    22 -
 src/3rdparty/tachyon/tachyon/intersect.c       |   197 -
 src/3rdparty/tachyon/tachyon/intersect.h       |    23 -
 src/3rdparty/tachyon/tachyon/jpeg.c            |   132 -
 src/3rdparty/tachyon/tachyon/jpeg.h            |     8 -
 src/3rdparty/tachyon/tachyon/light.c           |   294 -
 src/3rdparty/tachyon/tachyon/light.h           |    63 -
 src/3rdparty/tachyon/tachyon/macros.h          |    30 -
 src/3rdparty/tachyon/tachyon/parallel.c        |   368 -
 src/3rdparty/tachyon/tachyon/parallel.h        |    24 -
 src/3rdparty/tachyon/tachyon/parvol.c          |   216 -
 src/3rdparty/tachyon/tachyon/parvol.h          |    22 -
 src/3rdparty/tachyon/tachyon/plane.c           |    76 -
 src/3rdparty/tachyon/tachyon/plane.h           |    21 -
 src/3rdparty/tachyon/tachyon/pngfile.c         |   198 -
 src/3rdparty/tachyon/tachyon/pngfile.h         |     8 -
 src/3rdparty/tachyon/tachyon/ppm.c             |   132 -
 src/3rdparty/tachyon/tachyon/ppm.h             |    14 -
 src/3rdparty/tachyon/tachyon/psd.c             |    64 -
 src/3rdparty/tachyon/tachyon/psd.h             |     9 -
 src/3rdparty/tachyon/tachyon/quadric.c         |   133 -
 src/3rdparty/tachyon/tachyon/quadric.h         |    26 -
 src/3rdparty/tachyon/tachyon/render.c          |   467 -
 src/3rdparty/tachyon/tachyon/render.h          |    10 -
 src/3rdparty/tachyon/tachyon/ring.c            |    91 -
 src/3rdparty/tachyon/tachyon/ring.h            |    22 -
 src/3rdparty/tachyon/tachyon/sgirgb.c          |    76 -
 src/3rdparty/tachyon/tachyon/sgirgb.h          |     7 -
 src/3rdparty/tachyon/tachyon/shade.c           |   754 -
 src/3rdparty/tachyon/tachyon/shade.h           |    30 -
 src/3rdparty/tachyon/tachyon/sphere.c          |    99 -
 src/3rdparty/tachyon/tachyon/sphere.h          |    22 -
 src/3rdparty/tachyon/tachyon/tachyon.h         |  1144 -
 src/3rdparty/tachyon/tachyon/tachyon_dep.h     |    55 -
 src/3rdparty/tachyon/tachyon/texture.c         |   522 -
 src/3rdparty/tachyon/tachyon/texture.h         |    35 -
 src/3rdparty/tachyon/tachyon/tgafile.c         |   275 -
 src/3rdparty/tachyon/tachyon/tgafile.h         |    13 -
 src/3rdparty/tachyon/tachyon/threads.c         |  1830 -
 src/3rdparty/tachyon/tachyon/threads.h         |   519 -
 src/3rdparty/tachyon/tachyon/trace.c           |   381 -
 src/3rdparty/tachyon/tachyon/trace.h           |    29 -
 src/3rdparty/tachyon/tachyon/triangle.c        |   461 -
 src/3rdparty/tachyon/tachyon/triangle.h        |    62 -
 src/3rdparty/tachyon/tachyon/ui.c              |    59 -
 src/3rdparty/tachyon/tachyon/ui.h              |    20 -
 src/3rdparty/tachyon/tachyon/util.c            |   633 -
 src/3rdparty/tachyon/tachyon/util.h            |   111 -
 src/3rdparty/tachyon/tachyon/vector.c          |    92 -
 src/3rdparty/tachyon/tachyon/vector.h          |    20 -
 src/3rdparty/tachyon/tachyon/vol.c             |   305 -
 src/3rdparty/tachyon/tachyon/vol.h             |    13 -
 src/3rdparty/tachyon/tachyon/winbmp.c          |    95 -
 src/3rdparty/tachyon/tachyon/winbmp.h          |     8 -
 src/3rdparty/tachyon/unix/.#Make-arch.1.134    |  1287 -
 src/3rdparty/tachyon/unix/.#Make-arch.1.148    |  1349 -
 src/3rdparty/tachyon/unix/.#Make-arch.1.157    |  1440 -
 src/3rdparty/tachyon/unix/.DS_Store            |   Bin 6148 -> 0 bytes
 src/3rdparty/tachyon/unix/Make-arch            |  1732 -
 src/3rdparty/tachyon/unix/Make-config          |   265 -
 src/3rdparty/tachyon/unix/Make-distrib         |    38 -
 src/3rdparty/tachyon/unix/Make-opengl          |    67 -
 src/3rdparty/tachyon/unix/Makefile             |   386 -
 src/3rdparty/tachyon/unix/Makefile.msvc        |  3843 --
 src/3rdparty/tachyon/unix/README               |   180 -
 158 files changed, 137704 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ovito.git



More information about the debian-science-commits mailing list