tree 1cb092b0dee667a66e6f9d258f2025729be2bb27
parent 62f3c3ffa7e97c700e1d89006c2eef71b9013fbf
parent ea704a1183fcd9ebc8a6b89d28788dc06720d42a
author Jon Leech <oddhack@sonic.net> 1485435861 -0800
committer Jon Leech <oddhack@sonic.net> 1485435861 -0800

My bad for operating on the wrong upstream for several days without
realizing it. Need to make sure cl.xml extension changes from github are
still present.

Merge branch 'master' of github.com:KhronosGroup/OpenCL-Registry

Conflicts:
	index.php