diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:17:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:17:36 +0100 |
| commit | 8a776726457ad20afc4e7cf9115b309034dd0f25 (patch) | |
| tree | cc0ec090115aa63dfc90ab4cffcbd59907b92578 /libavutil/avutilres.rc | |
| parent | 7fce8c752d87ca4738179bb7e9238bae67abdeac (diff) | |
| parent | 802987f8c7033ec8b82b35438d3822cf7f761166 (diff) | |
| download | ffmpeg-8a776726457ad20afc4e7cf9115b309034dd0f25.tar.gz | |
Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
x11grab: Unbreak building
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/avutilres.rc')
0 files changed, 0 insertions, 0 deletions