| commit | 8114511a7c91000a8446a0a3278cdd9d76653d45 | |
| author | Nathan Caldwell <saintdev@gmail.com> | |
| Tue, 11 Aug 2009 05:28:36 +0000 (10 23:28 -0600) | ||
| committer | Nathan Caldwell <saintdev@gmail.com> | |
| Tue, 11 Aug 2009 05:28:36 +0000 (10 23:28 -0600) | ||
| tree | 71471e53a977c659cbf18bd828685f3aa1e846d4 | treesnapshot (tar.gz zip) |
| parent | 5cf72736d147e6e770d26f3ecc0dafd4e81c5b7a | commitdiff |
| parent | e324a3ba1805bca4e74c4f50f425da75116364b6 | commitdiff |
Merge branch 'master' of git://git.ffmpeg.org/ffmpeg into lagarith-fixes
Conflicts:
Changelog
Conflicts:
Changelog
| Changelog | diff1 | diff2 | blobhistory |
| doc/general.texi | diff1 | diff2 | blobhistory |