Google Git
Sign in
skia/external/github.com/KhronosGroup/OpenGL-Registry/78bccf93dee5a3893fe966bbfdaf25eb7b153d32
commit
78bccf93dee5a3893fe966bbfdaf25eb7b153d32
[log]
author
Frederik Juhl Andreasen <fjaplv64@gmail.com>
Sat Nov 21 15:21:48 2020 +0100
committer
Frederik Juhl Andreasen <fjaplv64@gmail.com>
Sat Nov 21 15:21:48 2020 +0100
tree
5d9c8c6e88bbf8d0a90518500ada632c0f391c56
parent
5782f1dd6f3f2a65cff34605a26d507e3a50c9d2 [diff]
parent
0dc24166d162723781f1bf9fe433f71fa03a7aa0 [diff]
fix merge conflicts
tree: 5d9c8c6e88bbf8d0a90518500ada632c0f391c56
  1. ABI/
  2. api/
  3. docs/
  4. extensions/
  5. specs/
  6. xml/
  7. .htaccess
  8. CODE_OF_CONDUCT.md
  9. index.php
  10. index_es.php
  11. index_gl.php
  12. index_sc.php
  13. README.adoc