diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
| commit | e8a18157bce8e0b0cbde5bd52aaf5ae0940297d3 (patch) | |
| tree | 89fc1343a6302c7ee5d72774fde0f5b67d0b1927 /libre/pacman-mirrorlist-libre | |
| parent | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (diff) | |
| parent | 39711f3264d3b9de2ff6392649274d6333932457 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
staging/digikam/PKGBUILD
testing/curl/PKGBUILD
Diffstat (limited to 'libre/pacman-mirrorlist-libre')
0 files changed, 0 insertions, 0 deletions