]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e98efb 1ad8257)
Merge commit 'remotes/lamarck/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 4 Apr 2008 12:19:45 +0000 (14:19 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 4 Apr 2008 12:19:45 +0000 (14:19 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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