[ocl-icd] 02/03: Merge tag 'upstream/2.2.5' into sid

[Vincent Danjean]

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

vdanjean pushed a commit to branch master
in repository ocl-icd.

commit ab6b0b47993879d6f5265fc4af5e5dc98b39e479
Merge: eb20bec b736a8a
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Sat Jun 6 18:26:44 2015 +0200

    Merge tag 'upstream/2.2.5' into sid
    
    Upstream version 2.2.5

 NEWS                | 16 +++++++++++
 configure           | 20 ++++++-------
 configure.ac        |  2 +-
 doc/libOpenCL.7.txt | 12 ++++----
 icd_generator.rb    | 34 +++++++++++++---------
 libdummy_icd.c      | 32 +++++++++++++++++++++
 ocl_icd_loader.c    | 81 ++++++++++++++++++++++++++++++++++++++++++-----------
 tests/package.m4    |  4 +--
 tests/testsuite     | 12 ++++----
 9 files changed, 158 insertions(+), 55 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ocl-icd.git