| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | doc&tools: Add murge script, for analyzing 3 way conflicts. | Michael Niedermayer | 2016-08-22 | 1 | -0/+4 |
| | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | ||||
| * | doc: add Libav merge document | Clément Bœsch | 2016-08-17 | 1 | -0/+110 |
 |
index : ffmpeg | |
| Mirror of FFmpeg git repo |
| aboutsummaryrefslogtreecommitdiffstats |