diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-24 14:34:05 +0100 |
| commit | ee6ba8d4dcf31aa630641953009a27b3fd700faa (patch) | |
| tree | e0b23465af10683570926837a56ade01adc17307 /extra/python2 | |
| parent | d090dd0cd7b9488aebc92281720a0c5804950f32 (diff) | |
| parent | c65624e6d74bffd70dcd67cc28448b5a50596efb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ecryptfs-utils/PKGBUILD
community/pylibacl/PKGBUILD
extra/kwebkitpart/PKGBUILD
extra/php/PKGBUILD
extra/qhull/PKGBUILD
kde-unstable/kdegames-kigo/PKGBUILD
kde-unstable/kdeutils-print-manager/PKGBUILD
Diffstat (limited to 'extra/python2')
0 files changed, 0 insertions, 0 deletions