Merge branch 'afh_cleanup' into next.
authorAndre Noll <maan@systemlinux.org>
Sat, 4 Jul 2009 15:15:50 +0000 (17:15 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 4 Jul 2009 15:15:50 +0000 (17:15 +0200)
commit299df142bb50bacebc0b3050768f941bc95b5b6f
treedf36bd454c09e88c612930af2f2cd28988fe6b39
parent732bf143e456df7fc2e845884fbbdfdaf3fafebc
parent337d7784b0f8bc30b1fa9af56ace503acd97d40d
Merge branch 'afh_cleanup' into next.

Quite a few conflicts, but no real problem. git rerere rulez!

Conflicts:
afs.c
afs.cmd
aft.c
attribute.c
audiod_command.c
blob.c
command.c
para.h
server.c
server.cmd
stat.c
20 files changed:
Makefile.in
aac_afh.c
afs.c
afs.cmd
afs.h
aft.c
attribute.c
audiod.c
blob.c
command.c
configure.ac
error.h
mp3_afh.c
ogg_afh.c
para.h
send_common.c
server.c
server.cmd
string.c
string.h