]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2763810 786010c)
Merge branch 'master' into my-osx
authormaan <maan@Gumbo.local>
Thu, 15 Jun 2006 10:45:39 +0000 (12:45 +0200)
committermaan <maan@Gumbo.local>
Thu, 15 Jun 2006 10:45:39 +0000 (12:45 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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