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

db4
Joe Groff 2009-10-28 21:04:11 -05:00
commit c318530bbd
3 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
USING: calendar ftp.server io.encodings.ascii io.files USING: calendar ftp.server io.encodings.ascii io.files
io.files.unique namespaces threads tools.test kernel io.files.unique namespaces threads tools.test kernel
io.servers.connection ftp.client accessors urls io.servers.connection ftp.client accessors urls
io.pathnames io.directories sequences fry ; io.pathnames io.directories sequences fry io.backend ;
FROM: ftp.client => ftp-get ; FROM: ftp.client => ftp-get ;
IN: ftp.server.tests IN: ftp.server.tests

View File

@ -3,7 +3,7 @@
USING: fry images.loader images.normalization images.viewer io USING: fry images.loader images.normalization images.viewer io
io.directories io.encodings.binary io.files io.pathnames io.directories io.encodings.binary io.files io.pathnames
io.streams.byte-array kernel locals namespaces quotations io.streams.byte-array kernel locals namespaces quotations
sequences serialize tools.test ; sequences serialize tools.test io.backend ;
IN: images.testing IN: images.testing
<PRIVATE <PRIVATE

View File

@ -65,7 +65,7 @@ CONSTANT: SOUND-WALK4 7
CONSTANT: SOUND-UFO-HIT 8 CONSTANT: SOUND-UFO-HIT 8
: init-sound ( index cpu filename -- ) : init-sound ( index cpu filename -- )
absolte-path swapd [ sounds>> nth AL_BUFFER ] dip absolute-path swapd [ sounds>> nth AL_BUFFER ] dip
create-buffer-from-wav set-source-param ; create-buffer-from-wav set-source-param ;
: init-sounds ( cpu -- ) : init-sounds ( cpu -- )