| commit | dce1657a5eb260d633ee7c8e39be95cc99a4452d | |
| author | EvanR <evanrinehart@gmail.com> | |
| Sat, 27 Feb 2010 23:00:04 +0000 (27 17:00 -0600) | ||
| committer | EvanR <evanrinehart@gmail.com> | |
| Sat, 27 Feb 2010 23:00:04 +0000 (27 17:00 -0600) | ||
| tree | b209334e8057ba2328042524c1496beec074f67e | treesnapshot (tar.gz zip) |
| parent | 9f345a35dc30707cf1d2ed4dbbbb32afaa779eb9 | commitdiff |
| parent | d0857d9676a40732b56c7f4be68bca898e5862e8 | commitdiff |
Merge branch 'io' into audio
In order to test the midi file reader and generally the music
player, I needed the updated binary i/o methods from the new
loader. These changes were on the io branch so I got them.
Conflicts:
Makefile - added zip.o
video.c - changed printf to boot_msg and error_msg
In order to test the midi file reader and generally the music
player, I needed the updated binary i/o methods from the new
loader. These changes were on the io branch so I got them.
Conflicts:
Makefile - added zip.o
video.c - changed printf to boot_msg and error_msg
| Makefile | diff1 | diff2 | blobhistory |
| audio.c | diff1 | diff2 | blobhistory |