git.tuebingen.mpg.de Git - paraslash.git/commit - versions/paraslash-0.2.11.tar.bz2

]> git.tuebingen.mpg.de Git - paraslash.git/commit - versions/paraslash-0.2.11.tar.bz2

projects / paraslash.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 63afe81 abbddde)

author	Andre <maan@p133.(none)>
	Sat, 11 Mar 2006 16:45:20 +0000 (17:45 +0100)
committer	Andre <maan@p133.(none)>
	Sat, 11 Mar 2006 16:45:20 +0000 (17:45 +0100)
commit	1f556ae88bd8c85d4452f689f532f5a6abeabe92
tree	875f7299fa8ea2c46b606e74006afacdda54f36d	tree \| snapshot
parent	63afe815dbecded66415b041a98c5bc1b060dc95	commit \| diff
parent	abbddde3ee707103d5d8b088c8fa6fc53f09ebff	commit \| diff

Merge branch 'dccp'

Fix up merge conflicts by hand.
Conflicts:

configure.ac
error.h
server.ggo

configure.ac	diff1 \|	diff2 \|	blob \| history
error.h	diff1 \|	diff2 \|	blob \| history
server.c	diff1 \|	diff2 \|	blob \| history
server.ggo	diff1 \|	diff2 \|	blob \| history

paraslash - network audio streaming tools