diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:29:46 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-07 12:29:46 -0300 |
| commit | fba1f9077f6d545ad97b66b10b62ff44425a3c68 (patch) | |
| tree | be05c977bb3fb4b75cfcce0e13493625adbe17f1 /libre/ffmpeg-libre | |
| parent | 730bda0e79d3e122d665663a18e0c973d7209236 (diff) | |
| parent | 3a9ddbf363ba691ca209ad36485390d14ba3b46f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
libre/abs-libre/PKGBUILD
libre/icecat/PKGBUILD
libre/libretools/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mplayer-libre/PKGBUILD
libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
libre/pacman/PKGBUILD
libre/python2-libre/PKGBUILD
Diffstat (limited to 'libre/ffmpeg-libre')
0 files changed, 0 insertions, 0 deletions