]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 21:29:06 +0000 (22:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 21:29:24 +0000 (22:29 +0100)
commit75f6ed8dc2321d34a0c0b3b9ec7705e7ce7dc0ea
tree4dfdd73966af1069a543e352c0d4467064fef903
parent26dad980baaa6858561b3269d375c1d9223f579c
parentc91488ab33679add25eeb8c0229dc0b8f6acb5a4
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: fix one accented word

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