]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b93679d 439d8d0)
Merge remote-tracking branch 'refs/remotes/bthcx/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 21 Aug 2013 18:54:51 +0000 (20:54 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 21 Aug 2013 18:54:51 +0000 (20:54 +0200)

Trivial merge
paraslash - network audio streaming tools