diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-02 10:21:33 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-02 10:21:33 +0100 |
commit | 7331003f023f979ab7ad98bdca0eceed11af5957 (patch) | |
tree | cd10099276da7590c6cdb28528442a4f7a889cf4 /community/gmerlin-avdecoder/PKGBUILD | |
parent | 312d1a232de2133d8af1628d46782e70d07766e9 (diff) | |
parent | 35bd2bb6857eb818ca53b8fe34d88106133342f4 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/calf/PKGBUILD
community/geany-plugins/PKGBUILD
community/noip/PKGBUILD
core/procps-ng/PKGBUILD
Diffstat (limited to 'community/gmerlin-avdecoder/PKGBUILD')
0 files changed, 0 insertions, 0 deletions