]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 073076f 5a74392)
Merge branch 'refs/heads/t/i9e'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 3 Jul 2016 08:20:35 +0000 (10:20 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 3 Jul 2016 08:20:35 +0000 (10:20 +0200)
Started on 2016-03-08, cooking for three months.

* refs/heads/t/i9e:
  i9e: Replace assertion with warning.
  i9e: Fix compilation on Ubuntu-12.04.
  i9e: print warning if keyseq can not be mapped.
  i9e: Zero out private pointer on open.


Trivial merge
paraslash - network audio streaming tools