[khronos-opencl-headers] 20/94: Merge tag 'upstream/1.2-2011.11.16'

[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 5c693ea37a48f76874fc46718da6a7745fba716c
Merge: ef5952b 46b6412
Author: Russ Allbery <rra at debian.org>
Date:   Mon Jan 23 11:11:54 2012 -0800

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

 cl.h                     | 387 ++++++++++++++++++++++++++++++++++++++---------
 cl_d3d10.h               |   2 +-
 cl_d3d10.h => cl_d3d11.h |  72 ++++-----
 cl_dx9_media_sharing.h   | 119 +++++++++++++++
 cl_gl.h                  |  92 ++++++-----
 cl_gl_ext.h              |   2 +-
 cl_platform.h            |   3 +
 7 files changed, 524 insertions(+), 153 deletions(-)

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