[asl] 32/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 d6c8ffb0a3f631ec8cb8d4906e1a84a67a3cb9c7
Merge: 69b7992 797f368
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Jun 15 13:14:36 2015 +0300

    Merge branch 'develop'

 CMakeLists.txt              |  8 ++------
 DefineFunctions.cmake       |  8 ++++----
 DefineOptions.cmake         |  5 ++---
 doc/CMakeLists.txt          | 11 +++++++++++
 test/testACL/CMakeLists.txt |  8 +++++---
 5 files changed, 24 insertions(+), 16 deletions(-)

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