summaryrefslogtreecommitdiff
path: root/community/ibus-pinyin/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-13 11:26:30 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-13 11:26:30 -0300
commitea319c11ce5dcbe5994f166ea099b115bbffe960 (patch)
tree365b7a8276a93d738840c4481a1ff5e327920738 /community/ibus-pinyin/PKGBUILD
parent37936150d275890b518542e93a435ab5815d722b (diff)
parent21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/conntrack-tools/01-config-file-path.patch community-testing/conntrack-tools/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/gigi/PKGBUILD community-testing/glob2/PKGBUILD community-testing/megaglest/PKGBUILD community-testing/openimageio/PKGBUILD community/gtk2hs-buildtools/PKGBUILD community/haddock/PKGBUILD community/haskell-dataenc/PKGBUILD community/haskell-ghc-paths/PKGBUILD community/haskell-haskeline/PKGBUILD community/haskell-hslogger/PKGBUILD community/haskell-tar/PKGBUILD community/haskell-terminfo/PKGBUILD community/haskell-utf8-string/PKGBUILD community/haskell-x11-xft/PKGBUILD community/libnetfilter_acct/PKGBUILD community/libnetfilter_conntrack/PKGBUILD community/libnetfilter_queue/PKGBUILD community/libnfnetlink/PKGBUILD community/sfk/PKGBUILD extra/cabal-install/PKGBUILD extra/claws-mail/PKGBUILD extra/haskell-http/PKGBUILD extra/haskell-mtl/PKGBUILD extra/haskell-network/PKGBUILD extra/haskell-parsec/PKGBUILD extra/haskell-text/PKGBUILD extra/haskell-transformers/PKGBUILD extra/haskell-zlib/PKGBUILD extra/nx/PKGBUILD extra/ocaml/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-gnutls/PKGBUILD multilib/lib32-libtiff/PKGBUILD multilib/lib32-libxcb/PKGBUILD multilib/libtool-multilib/PKGBUILD social/squirm/PKGBUILD staging/kdebindings-python/PKGBUILD testing/curl/PKGBUILD testing/dnsutils/PKGBUILD testing/dnsutils/remove-bind.patch testing/mesa/PKGBUILD testing/openldap/PKGBUILD testing/pam/PKGBUILD testing/subversion/PKGBUILD testing/systemd/PKGBUILD testing/sysvinit/PKGBUILD
Diffstat (limited to 'community/ibus-pinyin/PKGBUILD')
0 files changed, 0 insertions, 0 deletions