Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	extra/spheres/spheres.factor
db4
Joe Groff 2009-05-03 22:06:37 -05:00
commit 70c8a1bef0
1 changed files with 1 additions and 1 deletions

View File

@ -1,7 +1,7 @@
USING: kernel opengl opengl.demo-support opengl.gl opengl.textures
opengl.shaders opengl.framebuffers opengl.capabilities multiline
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 ;
IN: spheres