]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca659e6 043f0c8)
Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Sat, 4 Jul 2009 21:23:00 +0000 (23:23 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 4 Jul 2009 21:23:00 +0000 (23:23 +0200)
1  2 
INSTALL patch | diff1 | diff2 | blob | history

diff --cc INSTALL
Simple merge
paraslash - network audio streaming tools