diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-15 10:29:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-15 10:29:19 -0300 |
| commit | 3ed19e74567434fe0bc82d835513b5b62f151838 (patch) | |
| tree | 32427be3c933a7d96426b28d9c90eceb6ab8ff3d /core/libssh2 | |
| parent | d5be0922f99093b4659507a4c17c664ac5c2f577 (diff) | |
| parent | 8f1eb849d6de0031d4d91fb6d8780828b1ba924b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas3/PKGBUILD
community-staging/libextractor/PKGBUILD
community/haveged/PKGBUILD
community/libfm/PKGBUILD
core/lvm2/PKGBUILD
extra/geeqie/PKGBUILD
staging/calligra/PKGBUILD
Diffstat (limited to 'core/libssh2')
0 files changed, 0 insertions, 0 deletions