diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-18 12:59:58 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-18 12:59:58 -0300 |
| commit | f04f84ee9902c5aa8a88107bf0461aeef0030b9e (patch) | |
| tree | 18f02f6ddf8d00d97af855dba055f89f615e3939 /community/parole/PKGBUILD | |
| parent | f8dc0992fd9d1751e8de891cf74a655c32b8e922 (diff) | |
| parent | 63d179775e063452db6358e15b9847e7fc6c84b6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gummi/PKGBUILD
community-staging/mtpaint/PKGBUILD
community-staging/mtpaint/mtpaint.install
extra/php-xcache/PKGBUILD
kde-unstable/akonadi/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/parole/PKGBUILD')
0 files changed, 0 insertions, 0 deletions