summaryrefslogtreecommitdiff
path: root/extra/imap
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-25 11:34:48 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-25 11:34:48 -0300
commitf8f8c2edc0a58f29e716f32453ee296980faef03 (patch)
tree36550328b2ffc701ee93ee0d3f19f11d972e850e /extra/imap
parent8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (diff)
parentc52a1a6eb4ad278a7b6d9eeeb9c7c88f73ca8d8c (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/angband/PKGBUILD community/bashburn/PKGBUILD community/qgis/PKGBUILD core/libldap/PKGBUILD core/tcp_wrappers/PKGBUILD extra/openldap/PKGBUILD extra/speedtouch/PKGBUILD libre/kernel26-libre/PKGBUILD
Diffstat (limited to 'extra/imap')
0 files changed, 0 insertions, 0 deletions