Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:45:58 +0000 (00:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:45:58 +0000 (00:45 +0200)
commit7695a538ed24e3cef52f74a4eee731d137a97f4e
tree9bcbbaf2df0dde5610c5f7a93cc8ac247a42a7bc
parent9d91fae8a1091393ad96585324acc2328d8138f2
parentfbf4d2197f35bddccec00ad53185ee4ab81778a0
Merge commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0'

* commit 'fbf4d2197f35bddccec00ad53185ee4ab81778a0':
  build: Record explicit dependency of intrax8 on error resilience

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure