summaryrefslogtreecommitdiff
path: root/ffpresets
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-27 10:40:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-27 10:40:34 +0200
commitf52ad8ceddf3078dbfef7ab437ca8600a1f96ef2 (patch)
treeb2269696636ba3f82fcc6b0e9c2b92a15fb3b793 /ffpresets
parentc617d7b86a69aefafb0a5d6a9f916f9c97974c8f (diff)
parent001e600c3b8668191f96d7a1e46da0d7fff546de (diff)
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: spelling cosmetics dctref: make sure function declarations match between .c and .h file x86: fix build with gcc 4.7 Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffpresets')
0 files changed, 0 insertions, 0 deletions