diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-18 15:09:09 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-18 15:09:09 +0200 |
| commit | 911a818dc1dde41745d065b1272333f5668ed270 (patch) | |
| tree | a2f889a0b0b6922bcc32ca94b1b6ca31eda406b2 /extra/kdemultimedia-ffmpegthumbs/PKGBUILD | |
| parent | f5960fe27a2d814eab2ac7efacd714322c18a7b7 (diff) | |
| parent | b35ab776341c79068977be153a2ad8340eb9498c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/php-geoip/PKGBUILD
extra/libfprint/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-xcache/PKGBUILD
extra/serf/PKGBUILD
Diffstat (limited to 'extra/kdemultimedia-ffmpegthumbs/PKGBUILD')
0 files changed, 0 insertions, 0 deletions