tree 125b4e050d1430755b3bf71ab222d9f44f7f928a
parent 14b80ebeab022b2c78f84a573f01028c96075553
parent 94407bb4a0840a82efd6b367b551249a0f6e7bf6
author Jon Leech <devrel@oddhack.org> 1527282126 -0700
committer GitHub <noreply@github.com> 1527282126 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJbCHnOCRBK7hj4Ov3rIwAAdHIIAIfskUTxy/edmxtw113i4Ajl
 HtKPPrJ8l88QWPk29PcoA8JiN8UirY5OZw4c8X3mfv7b26z0Kl81fMZRKdiz+JG1
 ubrSzPBpvLwOaaqOkPXAWyi1vQksRWbAs5kP+GjcXlTEkmniHGcM5OF3vSrrLu7Z
 P9DR39BUf7XNIzloosT+8JVx6+DljDyiarEp82wDdnrGkqERQjJfJ8OjPM2phAuD
 yQ8xnnTQpFu4kzargXnQigRDqekeCjVp1xlPQRrqFKiH6PYPT98nwFatgM1eIMX6
 LZkf9/Qx2X2ic2nTKYyt6SOZEqbGmGzJXOaDX3O8C8KCiWmKb3F/zH+//cRTSq4=
 =20Xl
 -----END PGP SIGNATURE-----
 

Merge pull request #183 from c0d1f1ed/gl-gles-now-kiss

Fix conflicting type declarations in GL and GLES