diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
| commit | 2906c522e750f7e013d7af606f01ad849a7d3876 (patch) | |
| tree | d62491c93d6534817db7f9b7d07adf64b9670b48 /community/conntrack-tools/PKGBUILD | |
| parent | 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff) | |
| parent | bd614ac21d2754d778a796cd5e92d1568ec8baec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mesa/PKGBUILD
extra/nmap/PKGBUILD
extra/openmpi/PKGBUILD
extra/rasqal/PKGBUILD
extra/sqlite/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-hooks-udev
testing/udev/initcpio-install-udev
Diffstat (limited to 'community/conntrack-tools/PKGBUILD')
0 files changed, 0 insertions, 0 deletions