[asl] 23/33: Merge branch 'ambiguous-namespace' of https://github.com/Barthalion/ASL into 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 e7eb8991934bff438700615c6c89ab7d4c4a5a36
Merge: 2fd8846 179516b
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Tue Jan 26 11:17:49 2016 +0200

    Merge branch 'ambiguous-namespace' of https://github.com/Barthalion/ASL into develop

 src/utilities/aslParametersManager.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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