[asl] 138/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 3a490c46a90f0dd96e110ae9ae664d0e9d626997
Merge: 2e87711 9349a5d
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Sat Aug 1 23:39:49 2015 +0300

    Merge branch 'develop'

 doc/Developer-Guide/Doxyfile.cmake.in |   2 +-
 src/acl/cl.hpp                        | 101 +---------------------------------
 2 files changed, 2 insertions(+), 101 deletions(-)

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