From: Doug Coleman <doug.coleman@gmail.com>
Date: Tue, 22 Sep 2009 15:25:42 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5496
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=51ddc963b86973afd4c8c3df90700afdb94e6fa3

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

Conflicts:
	core/generic/generic-tests.factor
---

51ddc963b86973afd4c8c3df90700afdb94e6fa3
diff --cc core/generic/generic-tests.factor
index 9d6721c44b,fc6f50e18f..1691ca8932
--- a/core/generic/generic-tests.factor
+++ b/core/generic/generic-tests.factor
@@@ -1,8 -1,9 +1,9 @@@
- USING: accessors alien arrays definitions generic generic.standard
- generic.math assocs hashtables io kernel math namespaces parser
- prettyprint sequences strings tools.test vectors words
- quotations classes classes.algebra classes.tuple continuations
- layouts classes.union sorting compiler.units eval io.streams.string ;
 -USING: accessors alien arrays definitions generic
 -generic.standard generic.math assocs hashtables io kernel math
 -math.order namespaces parser prettyprint sequences strings
 -tools.test vectors words quotations classes classes.algebra
 -classes.tuple continuations layouts classes.union sorting
 -compiler.units eval multiline io.streams.string ;
++USING: accessors alien arrays assocs classes classes.algebra
++classes.tuple classes.union compiler.units continuations
++definitions eval generic generic.math generic.standard
++hashtables io io.streams.string kernel layouts math math.order
++namespaces parser prettyprint quotations sequences sorting
++strings tools.test vectors words ;
  IN: generic.tests
  
  GENERIC: foobar ( x -- y )
@@@ -195,4 -202,4 +196,4 @@@ M: slice foozul 
      fixnum \ <=> method-for-class
      real \ <=> method
      eq?
--] unit-test
++] unit-test