[asl] 126/177: Merge branch 'master' of gitlab.com:AvtechScientific/ASL-dev

[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 c8c930917a775d3b0ad44e45414ee834800bed2f
Merge: 2085086 266a828
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 29 17:32:10 2015 +0300

    Merge branch 'master' of gitlab.com:AvtechScientific/ASL-dev

 CMakeLists.txt                              | 21 ++++++++++-----------
 NEWS.md                                     |  1 +
 README.md                                   |  4 ++--
 cmake/ASLBuildOptions.cmake                 |  3 ++-
 test/testACL/CMakeLists.txt                 |  5 -----
 utilities/CMakeLists.txt                    |  6 ++++++
 {test/testACL => utilities}/asl-hardware.cc |  0
 7 files changed, 21 insertions(+), 19 deletions(-)

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