diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
| commit | d27bbcebde95f792e0660af3657878216b2590c3 (patch) | |
| tree | ebd693dbaeb22eb25643e06b80facc1e0f073e77 /extra/ffmpegthumbnailer | |
| parent | 68dc88e3f45d6cb33a56ca10ec02f7e990636d31 (diff) | |
| parent | 0671250710c3e7312a4693ac45ebbaacf471d1dc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/curl/PKGBUILD
core/lvm2/PKGBUILD
core/openvpn/PKGBUILD
extra/diffstat/PKGBUILD
extra/libxcb/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'extra/ffmpegthumbnailer')
0 files changed, 0 insertions, 0 deletions