diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-26 10:36:11 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-26 10:36:11 -0300 |
| commit | 33f415176525625b793cdfa66f3fc5828214a34e (patch) | |
| tree | 4f60a7d083ef4d8d0324f840d13267e58d790a17 /~mtjm | |
| parent | 14a4ed053872549facd5a1f4817bee71bb21c8f7 (diff) | |
| parent | 9a6b691757346035549dbd12d1323301d04a6675 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus-core/dbus
testing/dbus-core/dbus.install
testing/psmisc/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd-tools.install
testing/systemd/systemd.install
testing/sysvinit/PKGBUILD
Diffstat (limited to '~mtjm')
0 files changed, 0 insertions, 0 deletions