diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-06 09:54:36 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-06 09:54:36 +0200 |
| commit | 7e625170ad4fd86bb2ee338c7be9a352bf418b00 (patch) | |
| tree | 255b053e743089df19bd413de519547ac617c35a /community/pcsclite/PKGBUILD | |
| parent | 932031ec841dccbd40ce373d464391f579a11a42 (diff) | |
| parent | 1613e8d1c11997f5507d90ecfc05213199aca3ed (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/icedtea-web/PKGBUILD
extra/nasm/PKGBUILD
extra/qtiplot/PKGBUILD
testing/iproute2/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/pcsclite/PKGBUILD')
0 files changed, 0 insertions, 0 deletions