Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Mar 2011 19:02:42 +0000 (20:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Mar 2011 19:05:11 +0000 (20:05 +0100)
commit8ea36711b0a85e24a77e1c76b1cb24aa63df217f
tree5699c8de8c2139e55c188a63a0bcb6f013895c83
parent43dc31f7469c873ccf3927c732a9c2d7d85360bb
parentec10a9ab461b26b96eff7bbbb8623f42d8ee04ad
Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
    commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000

        Remove Sonic experimental audio codec

    commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000

        Replace FFmpeg with Libav in licence headers
Doxyfile
Makefile
configure
doc/developer.texi
doc/faq.texi
doc/general.texi
libpostproc/postprocess.c
version.sh