[khronos-opencl-headers] 71/94: Merge tag 'upstream/1.2-2014.04.13'

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository khronos-opencl-headers.

commit 717c977d9f857d240d1c9e7fa4d64c4dbd6898df
Merge: e4fb286 3bb61d7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu May 22 11:09:31 2014 +0200

    Merge tag 'upstream/1.2-2014.04.13'
    
    Upstream version 1.2-2014.04.13

 cl.h                   |   4 +-
 cl_d3d10.h             |  16 +--
 cl_d3d11.h             |  16 +--
 cl_dx9_media_sharing.h |  16 +--
 cl_ext.h               |  24 +++-
 cl_gl.h                |   2 +-
 cl_platform.h          | 346 ++++++++++++++++++++++++++-----------------------
 7 files changed, 229 insertions(+), 195 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-headers.git