diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-17 11:48:34 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-17 11:48:34 -0300 |
| commit | a873bdc69d24650d832933463af71dfaa96f1a8a (patch) | |
| tree | eb1be50481efd38ce5ea6dbaab797af5866a764c /libre/ffmpeg-libre | |
| parent | dceec836462f00192ea15364f86e3cfbac578bc0 (diff) | |
| parent | 68b7938bb87c6e91d54e4f35f0223c7237fa53e1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/virtualbox/PKGBUILD
extra/live-media/PKGBUILD
Diffstat (limited to 'libre/ffmpeg-libre')
0 files changed, 0 insertions, 0 deletions