Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 10:14:42 +0000 (12:14 +0200)
commit0940066b803769f041a7ac83cf0df7c23ab033cc
tree31bcb1302be6877a15a777182785b1fd6c5af708
parentef16d1260617cb942b495e322a9668c4b93265e0
parentb21e989a3c076d94cfdde0303724db841dd60cad
Merge commit 'b21e989a3c076d94cfdde0303724db841dd60cad'

* commit 'b21e989a3c076d94cfdde0303724db841dd60cad':
  ismindex: produce .ismf file

Conflicts:
tools/ismindex.c

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