summaryrefslogtreecommitdiff
path: root/community/pkgtools
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-12-04 14:32:45 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2011-12-04 14:32:45 +0100
commit03346d9676b006b2ba496a44d56f3efccc185d6a (patch)
tree3e6c51e16a4f6c2b64c5109af508539d54455d9a /community/pkgtools
parent61c0d1ec341c4979f7722696d3b7e6a958f81b10 (diff)
parent851376cd7720e1f9b35e0a7c26bfd66399f0c4d3 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/gnash/PKGBUILD community/python-pymongo/PKGBUILD extra/boost/PKGBUILD extra/liborigin2/PKGBUILD extra/libpst/PKGBUILD extra/lyx/PKGBUILD extra/mkvtoolnix/PKGBUILD multilib/wine/PKGBUILD
Diffstat (limited to 'community/pkgtools')
0 files changed, 0 insertions, 0 deletions