diff options
| author | Thorsten Glaser <tg@mirbsd.org> | 2009-12-20 17:34:09 +0059 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 17:37:01 +0100 |
| commit | b8342db24c4b4f1c45211352e120e21d2756b1dc (patch) | |
| tree | 6c1bb1c81778cfb38fd25934f7d6b1435192eced /package/ffmpeg/Makefile | |
| parent | ff88b47383f872dbc8b1cf734f5a1679cc9cbe9b (diff) | |
un-merge conflict by wbx@
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Diffstat (limited to 'package/ffmpeg/Makefile')
0 files changed, 0 insertions, 0 deletions