diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-03 15:31:08 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-03 15:31:08 +0100 |
| commit | 86e7521993c095c2082316197d345c04dde46327 (patch) | |
| tree | c251bad878348dc28bfa14b9583964fc142deddf /testing/mjpegtools/PKGBUILD | |
| parent | 6ca11940446fc579b8b58d05ea34843b13fe16f5 (diff) | |
| parent | 22e5f5bf64eba5c65674eeb3a8167de2854dbe0e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
kde-unstable/calligra/PKGBUILD
multilib/lib32-udev/PKGBUILD
testing/emacs/PKGBUILD
Diffstat (limited to 'testing/mjpegtools/PKGBUILD')
0 files changed, 0 insertions, 0 deletions