Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 19:02:56 +0000 (21:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 19:02:56 +0000 (21:02 +0200)
commit524eeaca228043c93d0f94ffe9c51149c0408f04
tree36156d06023b0c80774d11ff2d42cc28e12cb344
parent0d35d5ab1b73a91a3ccb20bf6a7415f6845905ad
parentf920d089535bf7cf10aeda900cc43201c5e18cd0
Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
tools/ismindex.c

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