Merge branch 'master' of git://factorcode.org/git/factor
Conflicts: extra/spheres/spheres.factordb4
commit
70c8a1bef0
|
@ -1,7 +1,7 @@
|
||||||
USING: kernel opengl opengl.demo-support opengl.gl opengl.textures
|
USING: kernel opengl opengl.demo-support opengl.gl opengl.textures
|
||||||
opengl.shaders opengl.framebuffers opengl.capabilities multiline
|
opengl.shaders opengl.framebuffers opengl.capabilities multiline
|
||||||
ui.gadgets accessors sequences ui.render ui math locals arrays
|
ui.gadgets accessors sequences ui.render ui math locals arrays
|
||||||
generalizations combinators ui.gadgets.worlds method-chains
|
generalizations combinators ui.gadgets.worlds
|
||||||
literals ui.pixel-formats ;
|
literals ui.pixel-formats ;
|
||||||
IN: spheres
|
IN: spheres
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue