]> git.tuebingen.mpg.de Git - paraslash.git/commit
projects / paraslash.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7adbab3 c62b1c7)
Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Thu, 13 Jul 2017 15:21:13 +0000 (17:21 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Thu, 13 Jul 2017 15:21:13 +0000 (17:21 +0200)
commit8d106ca317a2c42f35a86ba244f843688f6939e6
tree26874bc96b7449dd88fd68fb69063caa5aadb6b1tree | snapshot
parent7adbab371baac475d54c7672ff523316d7151327commit | diff
parentc62b1c7be957398d6641b00f2282fb7235091a3ccommit | diff
Merge branch 'maint'

A single important fix for the error subsystem. The merge conflicted
because master removed the E_AAC_AFH_INIT error code while maint
still has it. The conflict was trivial to resolve.

* refs/heads/maint:
  Let error codes start out at index 1.
error.h diff1 | diff2 | blob | history
paraslash - network audio streaming tools