[clfft] 19/23: Merge tag 'upstream/v2.6.1' into debian/sid

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit 259138e535d136681ec2c7f76c9973d0b3bac9e4
Merge: b88b015 1ca97a4
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Aug 18 15:02:36 2015 +0100

    Merge tag 'upstream/v2.6.1' into debian/sid
    
    version 2.6.1

 src/CMakeLists.txt                     |   2 +-
 src/client/client.cpp                  |  98 +++++++++++--------
 src/client/openCL.misc.cpp             |   7 +-
 src/library/CMakeLists.txt             |   2 +-
 src/library/generator.stockham.cpp     | 167 ++++++++++++++++++++++++++++++++-
 src/library/plan.cpp                   |   4 +-
 src/statTimer/statisticalTimer.GPU.cpp |  46 ++++++++-
 src/statTimer/statisticalTimer.GPU.h   |   6 ++
 src/tests/accuracy_test_pow3.cpp       |   2 +-
 src/tests/accuracy_test_pow5.cpp       |   2 +-
 10 files changed, 287 insertions(+), 49 deletions(-)

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