Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:33:46 +0000 (19:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:33:46 +0000 (19:33 +0200)
commit66328da700c73246e2d4c5254905f9e5b4e0fa31
tree7995096ae19997f784130738c2c5b87d2147793a
parentc32db6adab9942781cc5a23f62abb839a5595a83
parent6fb65973c9501d3fe94a5a9195c01cd20083066e
Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'

* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e':
  configure: Properly split dv1394 indev dependencies

Conflicts:
configure

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