]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9caff3 45b1c38)
Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sun, 30 Nov 2008 20:15:29 +0000 (21:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 30 Nov 2008 20:15:29 +0000 (21:15 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
paraslash - network audio streaming tools