]> gitweb.factorcode.org Git - factor.git/commit
opengl.textures: fix merge whoops.
authorJohn Benediktsson <mrjbq7@gmail.com>
Wed, 15 Jul 2015 00:54:14 +0000 (17:54 -0700)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 15 Jul 2015 00:54:14 +0000 (17:54 -0700)
commit284c5ac4e363608c037d86cfec8cc91fce07179b
treeb7ce3c9f55e002b9d460e2f5811723682b4e22b0
parent09f4c7941fdd4c1147d3c6b26b71473984008234
opengl.textures: fix merge whoops.
basis/opengl/textures/textures.factor