[asl] 83/177: Merge branch 'develop'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository asl.

commit 279de83d9d5ee1126e71c9b5e719be540f3463a3
Merge: eb0ff4a a9298c3
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 8 16:23:10 2015 +0300

    Merge branch 'develop'

 CMakeLists.txt                                  |   13 +-
 README.md                                       |   24 +-
 cmake/ASLConfig.cmake.in                        |    1 -
 doc/Developer-Guide/Doxyfile.in                 | 2357 ++++++++++++++---------
 examples/elastic/cubeIncompressibleGravity.cc   |    2 +-
 examples/flow/locomotive_in_tunnel.cc           |    4 +-
 src/CMakeLists.txt                              |   21 +-
 src/acl/CMakeLists.txt                          |    2 +-
 src/acl/Operators/CMakeLists.txt                |   14 +-
 src/acl/aclMath/CMakeLists.txt                  |   12 +-
 src/doxygenDefinitions.h                        |   16 +-
 src/math/aslInterpolation.h                     |   16 +-
 src/num/aslFDAdvectionDiffusion2.h              |   25 +-
 src/num/aslFDAdvectionDiffusionInhomogeneous.h  |    7 +-
 src/numExtend/CMakeLists.txt                    |   12 +-
 src/numExtend/aslFDAdvectionDiffusionExtended.h |    4 -
 src/utilities/aslParametersManager.cxx          |    6 +-
 src/utilities/aslParametersManager.h            |   48 +-
 18 files changed, 1530 insertions(+), 1054 deletions(-)

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