diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-23 19:54:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-23 19:54:52 +0100 |
| commit | 9abe0bfb7f52d450c9c4b392d8c4b88007562b31 (patch) | |
| tree | cb2834ef3023bbc28137d2fa50817ed55f8baa89 /libavcodec/arm/rv34dsp_init_arm.c | |
| parent | 13682b48e95c91cbcd80bc45880e09eca1ebdee2 (diff) | |
| parent | 26bbc1c242ebfeec3c49585207efac7293632433 (diff) | |
Merge commit '26bbc1c242ebfeec3c49585207efac7293632433' into release/2.2
* commit '26bbc1c242ebfeec3c49585207efac7293632433':
Prepare for 10 Release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/arm/rv34dsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions