From: Doug Coleman <doug.coleman@gmail.com>
Date: Sat, 27 Jun 2009 02:51:08 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~6044^2~14
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=1cb6bc99da9808bc128c639009c49eaf827b6fa5

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

Conflicts:
	basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
---

1cb6bc99da9808bc128c639009c49eaf827b6fa5
diff --cc basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
index 717cf36e14,d575450f43..fad1c022ef
--- a/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
+++ b/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
@@@ -1,10 -1,11 +1,11 @@@
 -USING: accessors arrays compiler.cfg compiler.cfg.instructions
 +USING: accessors arrays classes compiler.cfg
- compiler.cfg.instructions compiler.cfg.linear-scan.debugger
++compiler.cfg.debugger compiler.cfg.instructions
+ compiler.cfg.linear-scan.debugger
  compiler.cfg.linear-scan.live-intervals
  compiler.cfg.linear-scan.numbering
  compiler.cfg.linear-scan.resolve compiler.cfg.predecessors
 -compiler.cfg.registers compiler.cfg.rpo
 -compiler.cfg.debugger cpu.architecture kernel
 +compiler.cfg.registers compiler.cfg.rpo cpu.architecture kernel
- multiline namespaces tools.test vectors ;
+ namespaces tools.test vectors ;
  IN: compiler.cfg.linear-scan.resolve.tests
  
  [ { 1 2 3 4 5 6 } ] [