diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-05 12:14:43 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-05 12:14:43 -0300 |
| commit | 1a2fd51887f77ba9c41195c1a2eb9ee80ea28866 (patch) | |
| tree | 65f7f8ade72ab0e933e8be39880cb71992204e3b /community/tinyproxy | |
| parent | 4e3e2f9e625584fee1cdb96fcec3a49f0cacdc8b (diff) | |
| parent | 7f6f69dc52c8601768ba48fa7b69507a80d532cb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/wpa_supplicant/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/wine/PKGBUILD
testing/gcc/PKGBUILD
testing/glibc/PKGBUILD
testing/glibc/glibc-2.15-revert-c5a0802a.patch
testing/kmod/PKGBUILD
testing/lvm2/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/tinyproxy')
0 files changed, 0 insertions, 0 deletions