diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-06 23:38:28 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-06 23:38:28 -0300 |
| commit | 750a8fc982e640e6ef62f80afd99469959f407ad (patch) | |
| tree | cfc482b7afcc4e3502e67578825c439ee296b2d5 /extra/twisted | |
| parent | 2781491d77559e5a9f0e0d26698d91da745f14f3 (diff) | |
| parent | 3d65494a8eda056377febda4642ce992e69a9371 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/kmod/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/baobab/PKGBUILD
testing/empathy/PKGBUILD
testing/libgdata/PKGBUILD
testing/telepathy-farstream/PKGBUILD
testing/telepathy-haze/PKGBUILD
Diffstat (limited to 'extra/twisted')
0 files changed, 0 insertions, 0 deletions