[khronos-opencl-headers] 25/94: Merge tag 'upstream/1.2-2012.04.18'

[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 6c0c58eabeadf6f17bfce9517d8dbb4b0d229489
Merge: 25bd6b0 8fa0e0f
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed May 9 13:40:54 2012 +0200

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

 cl_d3d11.h             | 12 ++++++------
 cl_dx9_media_sharing.h | 30 +++++++++++++++++++-----------
 2 files changed, 25 insertions(+), 17 deletions(-)

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