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

Conflicts:

	core/io/files/files-tests.factor
db4
Doug Coleman 2008-03-01 00:00:07 -06:00
commit b353363c9f
1 changed files with 1 additions and 1 deletions

View File

@ -122,4 +122,4 @@ USING: tools.test io.files io threads kernel continuations ;
[ ] [ "copy-tree-test" temp-file delete-tree ] unit-test
[ t ] [ cwd "core" resource-path [ ] with-directory cwd = ] unit-test
[ t ] [ cwd "misc" resource-path [ ] with-directory cwd = ] unit-test