Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 18:37:00 +0000 (20:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 18:37:06 +0000 (20:37 +0200)
commit0d35d5ab1b73a91a3ccb20bf6a7415f6845905ad
tree81f0e4d80c900b2706aa7ef6e72b73bf4df38b68
parentd538dd824ee7abf9f3bb6459485f3e804fcc4777
parent6bc4934b75dde9354ee16a6e700ebe6775abf69e
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tools/ismindex.c