diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-21 11:27:08 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-21 11:27:08 -0300 |
| commit | 840283e9012eff70d83361c5ae058c4fb855979e (patch) | |
| tree | a0f93f9812348b55c9dfbf1cc6b81eba78caf6ee /extra/libidn | |
| parent | 93c61adf5995517ceecb6308255ff7fb85d59fcb (diff) | |
| parent | f02c28de0bbcb85e152fc19d0008805021fe1a33 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ascii/PKGBUILD
extra/gnome-utils/PKGBUILD
extra/libmodplug/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/rox/PKGBUILD
extra/totem/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/zsnes/PKGBUILD
testing/perl-compress-bzip2/PKGBUILD
Diffstat (limited to 'extra/libidn')
0 files changed, 0 insertions, 0 deletions