Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 09:20:13 +0000 (11:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 09:20:13 +0000 (11:20 +0200)
commit35469835bb2960f85b6c4acf19632333307937e7
tree32a24e79c1b95662d687176b374fce3dd79ed9db
parent4cabee50f624de9b9bb074d8571abb0f06e0b635
parente48d1ea541be4592ebac89875557407ca958b7a9
Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'

* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
tools/ismindex.c

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