git.tue.mpg.de Git - paraslash.git/commit

]> git.tue.mpg.de Git - paraslash.git/commit

author	Andre Noll <maan@systemlinux.org>
	Sat, 4 Jul 2009 15:15:50 +0000 (17:15 +0200)
committer	Andre Noll <maan@systemlinux.org>
	Sat, 4 Jul 2009 15:15:50 +0000 (17:15 +0200)
commit	299df142bb50bacebc0b3050768f941bc95b5b6f
tree	df36bd454c09e88c612930af2f2cd28988fe6b39	tree \| snapshot
parent	732bf143e456df7fc2e845884fbbdfdaf3fafebc	commit \| diff
parent	337d7784b0f8bc30b1fa9af56ace503acd97d40d	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
aac_afh.c	diff1 \|	diff2 \|	blob \| history
afs.c	diff1 \|	diff2 \|	blob \| history
afs.cmd	diff1 \|	diff2 \|	blob \| history
afs.h	diff1 \|	diff2 \|	blob \| history
aft.c	diff1 \|	diff2 \|	blob \| history
attribute.c	diff1 \|	diff2 \|	blob \| history
audiod.c	diff1 \|	diff2 \|	blob \| history
blob.c	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
error.h	diff1 \|	diff2 \|	blob \| history
mp3_afh.c	diff1 \|	diff2 \|	blob \| history
ogg_afh.c	diff1 \|	diff2 \|	blob \| history
para.h	diff1 \|	diff2 \|	blob \| history
send_common.c	diff1 \|	diff2 \|	blob \| history
server.c	diff1 \|	diff2 \|	blob \| history
server.cmd	diff1 \|	diff2 \|	blob \| history
string.c	diff1 \|	diff2 \|	blob \| history
string.h	diff1 \|	diff2 \|	blob \| history

paraslash - network audio streaming tools

RSS Atom

Makefile.in	diff1 \|	diff2 \|	blob \| history
aac_afh.c	diff1 \|	diff2 \|	blob \| history
afs.c	diff1 \|	diff2 \|	blob \| history
afs.cmd	diff1 \|	diff2 \|	blob \| history
afs.h	diff1 \|	diff2 \|	blob \| history
aft.c	diff1 \|	diff2 \|	blob \| history
attribute.c	diff1 \|	diff2 \|	blob \| history
audiod.c	diff1 \|	diff2 \|	blob \| history
blob.c	diff1 \|	diff2 \|	blob \| history
command.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
error.h	diff1 \|	diff2 \|	blob \| history
mp3_afh.c	diff1 \|	diff2 \|	blob \| history
ogg_afh.c	diff1 \|	diff2 \|	blob \| history
para.h	diff1 \|	diff2 \|	blob \| history
send_common.c	diff1 \|	diff2 \|	blob \| history
server.c	diff1 \|	diff2 \|	blob \| history
server.cmd	diff1 \|	diff2 \|	blob \| history
string.c	diff1 \|	diff2 \|	blob \| history
string.h	diff1 \|	diff2 \|	blob \| history