diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-31 10:45:34 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-31 10:45:34 -0300 |
| commit | db6d80995b7f835ba0b581a007bd0040e7d138b0 (patch) | |
| tree | 00d3b174ccb85f692744e12059bcd04cddb2137c /gis | |
| parent | 8226dd7c223cb14962fe6a76f369b96684563155 (diff) | |
| parent | 68cdc08aec92abf91448a542e06fabbedbb583bf (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/glibc/PKGBUILD
extra/telepathy-logger-qt/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd
testing/openssh/sshd.service
testing/spamassassin/PKGBUILD
testing/spamassassin/spamassassin.install
testing/upower/PKGBUILD
Diffstat (limited to 'gis')
0 files changed, 0 insertions, 0 deletions