]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 878bd60 ac6cf1c)
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Tue, 6 Oct 2009 21:16:27 +0000 (23:16 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 6 Oct 2009 21:16:27 +0000 (23:16 +0200)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
paraslash - network audio streaming tools