summaryrefslogtreecommitdiff
path: root/extra/scim-m17n/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-13 16:07:04 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-08-13 16:07:04 -0300
commite6b487980c858023cb4a3678f2d27f52c2a32596 (patch)
tree3a348db541d1a1ae1f356dd3970fff4910529558 /extra/scim-m17n/PKGBUILD
parentf08b6a2decf228473f030cfd49116c9fd0b05c37 (diff)
parent07a52495b8a64f14843878d6116151fbdb6deefb (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bird/PKGBUILD community/ecryptfs-utils/PKGBUILD community/linux-tools/PKGBUILD community/qtcurve-kde4/PKGBUILD extra/audacity/PKGBUILD extra/cups/PKGBUILD extra/imagemagick/PKGBUILD extra/kdeadmin/PKGBUILD extra/kdepim/PKGBUILD extra/kradio/PKGBUILD extra/libimobiledevice/PKGBUILD extra/libmowgli/PKGBUILD extra/llvm/PKGBUILD extra/phonon-vlc/PKGBUILD extra/pycrypto/PKGBUILD extra/xorg-server/PKGBUILD libre/linux-libre/PKGBUILD libre/syslinux/PKGBUILD multilib-staging/gcc-multilib/PKGBUILD multilib/lib32-libldap/PKGBUILD staging/binutils/PKGBUILD staging/gcc/PKGBUILD staging/glibc/PKGBUILD testing/cronie/PKGBUILD testing/cryptsetup/PKGBUILD testing/krb5/PKGBUILD testing/lvm2/PKGBUILD testing/net-tools/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to 'extra/scim-m17n/PKGBUILD')
0 files changed, 0 insertions, 0 deletions