Merge git://factorcode.org/git/factor

core/io/files/files-tests.factor

@@ -101,7 +101,7 @@ USING: tools.test io.files io threads kernel continuations ;
 
 [ ] [
     "copy-tree-test" temp-file
-    "copy-destination" temp-file copy-tree-to
+    "copy-destination" temp-file copy-tree-into
 ] unit-test
 
 [ "Foobar" ] [
@@ -109,7 +109,7 @@ USING: tools.test io.files io threads kernel continuations ;
 ] unit-test
 
 [ ] [
-    "copy-destination/copy-tree-test/a/b/c/d" temp-file "" temp-file copy-file-to
+    "copy-destination/copy-tree-test/a/b/c/d" temp-file "" temp-file copy-file-into
 ] unit-test
 
 [ "Foobar" ] [

extra/io/unix/kqueue/kqueue.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types kernel io.nonblocking io.unix.backend
-sequences assocs unix unix.kqueue unix.process math namespaces
+sequences assocs unix unix.time unix.kqueue unix.process math namespaces
 combinators threads vectors io.launcher
 io.unix.launcher ;
 IN: io.unix.kqueue

extra/tools/deploy/windows/windows.factor

@@ -10,12 +10,12 @@ IN: tools.deploy.windows
     vm over copy-file ;
 
 : copy-fonts ( bundle-name -- )
-    "fonts/" resource-path swap copy-tree-to ;
+    "fonts/" resource-path swap copy-tree-into ;
 
 : copy-dlls ( bundle-name -- )
     { "freetype6.dll" "zlib1.dll" "factor.dll" }
     [ resource-path ] map
-    swap copy-files-to ;
+    swap copy-files-into ;
 
 : create-exe-dir ( vocab bundle-name -- vm )
     dup copy-dlls