diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-25 11:33:12 -0300 |
| commit | 8b3071c77c79bbf0f373ca9b8ce0795c55d03669 (patch) | |
| tree | 0b9c9ccac567cbaf87b22dcd32f10ceed2db065c /testing/vsftpd/vsftpd.d | |
| parent | 0d18015803bebeb58911bf791653597291056095 (diff) | |
| parent | 43983783a3e8bf61896eb93a2858a14bbaf3a53b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/compiz-bcop/PKGBUILD
community/compiz-fusion-plugins-extra/PKGBUILD
community/compiz-fusion-plugins-main/PKGBUILD
community/emerald/PKGBUILD
community/gmic/PKGBUILD
community/libcompizconfig/PKGBUILD
core/xinetd/PKGBUILD
extra/archboot/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kipi-plugins/PKGBUILD
extra/libmpdclient/PKGBUILD
extra/live-media/PKGBUILD
extra/mysql/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/r/PKGBUILD
extra/telepathy-mission-control/PKGBUILD
libre/libretools/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libldap/ntlm.patch
multilib/wine/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'testing/vsftpd/vsftpd.d')
0 files changed, 0 insertions, 0 deletions