[asl] 157/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 bc03dc0ea7ec62f8534d27876ea0d681411db0a0
Merge: 16463aa a665de0
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Thu Aug 13 21:44:12 2015 +0300

    Merge branch 'develop'

 CMakeLists.txt                         | 230 ++++++++++++++++++---------------
 NEWS.md                                |   3 +-
 cmake/ASL.pc.in                        |  23 +++-
 cmake/ASLBuildFunctions.cmake          |  24 +++-
 cmake/ASLBuildOptions.cmake            |  23 +++-
 cmake/ASLConfig.cmake.in               |  23 +++-
 cmake/ASLPaths.cmake                   |  23 +++-
 doc/CMakeLists.txt                     |  26 +++-
 doc/Developer-Guide/Doxyfile.in        |  21 +++
 examples/CMakeLists.txt                |  28 +++-
 examples/elastic/CMakeLists.txt        |  32 ++++-
 examples/flow/CMakeLists.txt           |  48 +++++--
 examples/heatTransfer/CMakeLists.txt   |  24 +++-
 examples/jumpingObjects/CMakeLists.txt |  24 +++-
 examples/levelSet/CMakeLists.txt       |  24 +++-
 examples/massTransferSM/CMakeLists.txt |  30 ++++-
 src/CMakeLists.txt                     |  40 ++++--
 src/acl/CMakeLists.txt                 |  44 +++++--
 src/acl/DataTypes/acldatatypes.cmake   |  72 +++++++----
 src/acl/Kernels/aclkernels.cmake       |  42 ++++--
 src/acl/Operators/acloperators.cmake   |  24 +++-
 src/acl/aclMath/aclmath.cmake          |  24 +++-
 src/data/asldata.cmake                 |  24 +++-
 src/math/aslmath.cmake                 |  24 +++-
 src/num/CMakeLists.txt                 |  24 +++-
 src/numExtend/CMakeLists.txt           |  24 +++-
 test/CMakeLists.txt                    |  22 ++++
 test/testABD/CMakeLists.txt            |  24 +++-
 test/testACL/CMakeLists.txt            |  42 ++++--
 test/testAGL/CMakeLists.txt            |  25 +++-
 test/testMath/CMakeLists.txt           |  30 ++++-
 utilities/CMakeLists.txt               |  24 +++-
 32 files changed, 896 insertions(+), 219 deletions(-)

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