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

Conflicts:
	basis/opengl/debug/debug.factor

diff --git a/basis/cpu/x86/64/winnt/bootstrap.factor b/basis/cpu/x86/64/winnt/bootstrap.factor
index a9ce6cd3248a999225a666e2a62ba706a01e0b1d..2e3944fcaf10177c88e8158b02fff2388b8356cb 100644 (file)
--- a/basis/cpu/x86/64/winnt/bootstrap.factor
+++ b/basis/cpu/x86/64/winnt/bootstrap.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel namespaces system
-layouts vocabs sequences cpu.x86.assembler parser
+layouts vocabs parser sequences cpu.x86.assembler parser
 cpu.x86.assembler.operands ;
 IN: bootstrap.x86
 

diff --git a/basis/opengl/debug/debug.factor b/basis/opengl/debug/debug.factor
index 22d40cddc594dc993f482bedf1723b0842022811..0662a9c08ae87d115beb2901fa5442f19b109329 100644 (file)
--- a/basis/opengl/debug/debug.factor
+++ b/basis/opengl/debug/debug.factor
@@ -1,6 +1,6 @@
 ! (c)2009 Joe Groff bsd license
-USING: accessors kernel namespaces parser tools.continuations
-ui.backend ui.gadgets.worlds words sequences ;
+USING: accessors kernel namespaces parser sequences tools.continuations
+ui.backend ui.gadgets.worlds words ;
 IN: opengl.debug
 
 SYMBOL: G-world