]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f96fe40 67612cc)
Merge commit 'meins/next'
authorAndre Noll <maan@systemlinux.org>
Mon, 1 Dec 2008 14:02:26 +0000 (15:02 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 1 Dec 2008 14:02:26 +0000 (15:02 +0100)
1  2 
Makefile.in patch | diff1 | diff2 | blob | history

diff --cc Makefile.in
Simple merge
paraslash - network audio streaming tools