Merge commit '583a287f6f48f263859df142e6f90993e4217c72'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 09:28:58 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Oct 2013 09:29:02 +0000 (11:29 +0200)
commit47a57c6832d008f676837a9ee5f3a45b828c9ca1
tree61d8786e0f0560e97cc7c1cf1353ce6bb5663464
parent5de251a3e32e75c01bfc0c66be628fb9f07fdd04
parent583a287f6f48f263859df142e6f90993e4217c72
Merge commit '583a287f6f48f263859df142e6f90993e4217c72'

* commit '583a287f6f48f263859df142e6f90993e4217c72':
  ismindex: Calculate the file duration among the included tracks

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