Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:05:18 +0000 (15:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:05:18 +0000 (15:05 +0100)
commitb094931ab91108950fec221291bebcbc7b0ac12a
tree91853f8c8b2e42fd0b25826c75ab86ba53083ce2
parent6c17ff84ad8f2be64ddc9bd4955e1cc87842ac29
parent06b54e84254e4834b4978ff5b27cc2b7ee8d7a98
Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'

* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
  build: Fix error_resilience code dependencies

Conflicts:
configure

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