[asl] 123/177: Merge branch 'master' into develop
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository asl.
commit 536a0671a45a745df420b878f2a7f3391de2adfe
Merge: 952974d 5c9057e
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date: Wed Jul 29 12:47:03 2015 +0300
Merge branch 'master' into develop
CMakeLists.txt | 21 ++++++++++-----------
README.md | 4 ++--
cmake/ASLBuildOptions.cmake | 3 ++-
test/testACL/CMakeLists.txt | 5 -----
utilities/CMakeLists.txt | 6 ++++++
{test/testACL => utilities}/asl-hardware.cc | 0
6 files changed, 20 insertions(+), 19 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list