Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash
authorAndre Noll <maan@systemlinux.org>
Mon, 26 Mar 2007 12:51:03 +0000 (14:51 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 26 Mar 2007 12:51:03 +0000 (14:51 +0200)
commitfd7ddaebab6613627a070e8867ace2f2eb3d4cc3
treeea5def4d1bcedeaf005d84e69bc2ccdc646ec0b9
parent99054bc0013b3592b311027662bbacb6df49a4e2
parent970247623b17124a5aacb14a8061da56e1f3b0be
Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

Conflicts:

mp3_afh.c

Fix the conflict and add more detailed error message to para_mmap().
fd.c
mp3_afh.c