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

author Slava Pestov <slava@factorcode.org>

Wed, 26 Mar 2008 22:08:56 +0000 (17:08 -0500)

committer Slava Pestov <slava@factorcode.org>

Wed, 26 Mar 2008 22:08:56 +0000 (17:08 -0500)
author Slava Pestov <slava@factorcode.org>
Wed, 26 Mar 2008 22:08:56 +0000 (17:08 -0500)
committer Slava Pestov <slava@factorcode.org>
Wed, 26 Mar 2008 22:08:56 +0000 (17:08 -0500)
diff --cc core/io/io-tests.factor
Simple merge
diff --cc extra/io/encodings/8-bit/8-bit.factor

index ec75dc600a1c5892195020565aff81002159ba55,c041e699a264e4e6c88c58f33d2e1bb6b68bfae0..afa35e4181fe84d8f3e2fa8573153969c4595cb8

mode 100755,100644..100755
--- 1/extra/io/encodings/8-bit/8-bit.factor
--- 2/extra/io/encodings/8-bit/8-bit.factor
+++ b/extra/io/encodings/8-bit/8-bit.factor
author	Slava Pestov <slava@factorcode.org>
	Wed, 26 Mar 2008 22:08:56 +0000 (17:08 -0500)
committer	Slava Pestov <slava@factorcode.org>
	Wed, 26 Mar 2008 22:08:56 +0000 (17:08 -0500)
		1	2
core/io/io-tests.factor	patch \|	diff1 \|	diff2 \|	blob \| history
extra/io/encodings/8-bit/8-bit.factor	patch \|	diff1 \|	diff2 \|	blob \| history