[asl] 38/177: Merge branch 'remove_asl.ini'

[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 830680e61fe388bc7dfe781ab7230559d3d6287e
Merge: d6c8ffb e521798
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Fri Jun 19 13:54:28 2015 +0300

    Merge branch 'remove_asl.ini'

 src/acl/aclHardware.cxx                | 63 ++++++++++++++++----------
 src/acl/aclHardware.h                  | 10 +++-
 src/aslUtilities.cxx                   | 14 ++----
 src/aslUtilities.h                     |  4 +-
 src/utilities/aslParametersManager.cxx | 83 ++++++++++++++++++++++++++++++----
 src/utilities/aslParametersManager.h   | 13 ++++--
 6 files changed, 139 insertions(+), 48 deletions(-)

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