Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Sep 2013 12:06:46 +0000 (14:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Sep 2013 12:06:46 +0000 (14:06 +0200)
commit35307df53c578444decc8cfc02b376743fabea9c
tree67d57c94e23761cbac48722f0bd42c5d833e143b
parent1c10e89c5155fbd13fbf3c0da890a373145f1c32
parent0ebfdae099d2749240b6a565abcdf0bf62589748
Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
  doc: Describe TB option of setpts filter

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi