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)
* commit '11e05533170485b593974cf90916425a0188e7bd':
  Ignore generated file tools/sidxindex.

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

diff --cc .gitignore
@@@ -83,7 -59,5 +83,8 @@@
  /tools/pktdumper
  /tools/probetest
  /tools/qt-faststart
+ /tools/sidxindex
  /tools/trasher
 +/tools/seek_print
 +/tools/uncoded_frame
 +/tools/zmqsend