Michael Niedermayer 46ad2d9e44 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

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

2013-07-26 11:12:11 +02:00

16 KiB

Raw Blame History

View Raw