diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-23 19:31:16 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2013-01-23 19:31:16 -0300 |
commit | 59a85546825bde45248cd216c2d8fae8f72e4046 (patch) | |
tree | 4671056dabe2acadd54ab89d8cfcb46bf2283145 /community-testing/pinot/PKGBUILD | |
parent | 1f07b846d901eeaf0019566766f8a327ed2d078d (diff) | |
parent | 91fea2e90c87b282a3bb39b080b8c51eb52cdbbe (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/libzdb/PKGBUILD
community/notmuch/PKGBUILD
community/v8/PKGBUILD
community/zathura-ps/PKGBUILD
core/dash/PKGBUILD
extra/slim/PKGBUILD
Diffstat (limited to 'community-testing/pinot/PKGBUILD')
0 files changed, 0 insertions, 0 deletions