Merge commit '11e05533170485b593974cf90916425a0188e7bd'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Feb 2015 20:16:08 +0000 (21:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Feb 2015 20:16:15 +0000 (21:16 +0100)
commit8f79cd4764f7cdf3c5b5252e39ee0a6725f2eb94
tree15684e295f8d5c233a696e0780b877f02c95309c
parent7b32b35bf5c4b02a959477392dfe8963a33a6436
parent11e05533170485b593974cf90916425a0188e7bd
Merge commit '11e05533170485b593974cf90916425a0188e7bd'

* commit '11e05533170485b593974cf90916425a0188e7bd':
  Ignore generated file tools/sidxindex.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
.gitignore