diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-23 16:15:08 -0300 |
commit | 44ae571c1d57a21af2c915b42bb656cf0d69c9ee (patch) | |
tree | 757e53f443e27a95d1b1b0cdf337c2147953fc46 /testing/python-pyspi | |
parent | eadbb9961b89668e4aed317f5dd97cb04e86663e (diff) | |
parent | 1d20e4962664ab152948a14b4320b12204a1053e (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/libftdi/PKGBUILD
community/lxshortcut/PKGBUILD
community/pcmanfm/PKGBUILD
community/qingy/PKGBUILD
community/yagf/PKGBUILD
extra/ethtool/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/postgresql/PKGBUILD
extra/xfburn/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'testing/python-pyspi')
0 files changed, 0 insertions, 0 deletions