| commit | 20642b96ad82357a9e67437283b6d18a53477641 | [log] [tgz] |
|---|---|---|
| author | Jon Leech <oddhack@sonic.net> | Thu Jan 26 05:04:21 2017 -0800 |
| committer | Jon Leech <oddhack@sonic.net> | Thu Jan 26 05:04:21 2017 -0800 |
| tree | 1cb092b0dee667a66e6f9d258f2025729be2bb27 | |
| parent | 62f3c3ffa7e97c700e1d89006c2eef71b9013fbf [diff] | |
| parent | ea704a1183fcd9ebc8a6b89d28788dc06720d42a [diff] |
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