[yade] 01/03: Merge tag 'upstream/1.11.1'

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository yade.

commit bd5cd7ffaec1a9f50b3446bc73ce2ed3edf92f6e
Merge: 494c8fa dcde06c
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Aug 30 22:20:34 2014 +0200

    Merge tag 'upstream/1.11.1'
    
    Upstream version 1.11.1

 RELEASE                                            |   2 +-
 core/BodyContainer.cpp                             |  20 +-
 doc/references.bib                                 |  47 +++++
 doc/sphinx/github.rst                              | 202 +++++++++++++++++++++
 doc/sphinx/index-toctree.rst                       |   2 +
 doc/sphinx/installation.rst                        |   3 +-
 doc/sphinx/prog.rst                                |   2 +-
 examples/clumps/clump-hopper-test.py               |  79 ++++++++
 pkg/common/ForceEngine.cpp                         |  95 +++++++++-
 pkg/common/ForceEngine.hpp                         |  27 +++
 pkg/dem/TriaxialStressController.cpp               |   3 +-
 pkg/dem/TriaxialStressController.hpp               |   1 +
 pkg/dem/VTKRecorder.cpp                            | 143 +++++++++++++--
 pkg/dem/VTKRecorder.hpp                            |   4 +-
 pkg/dem/ViscoelasticPM.cpp                         |  22 ++-
 py/utils.py                                        |   2 +-
 scripts/checks-and-tests/checks/DEM-PFV-check.py   |  29 ++-
 .../checks-and-tests/checks/checkClumpHopper.py    |  80 ++++++++
 scripts/checks-and-tests/checks/checkViscElEng.py  |   4 +-
 scripts/checks-and-tests/checks/checkViscElPM.py   | 110 +++++++++++
 20 files changed, 822 insertions(+), 55 deletions(-)

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