diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
| commit | 572f3b3bd973bfa7e64c4c42fe87c8e3a79b7c20 (patch) | |
| tree | 89f43dd22eaacadfa97977de1f3b73285da15735 /community/fcitx-unikey/PKGBUILD | |
| parent | cebf33d7109e0157a80f34d6136e212f0a28d274 (diff) | |
| parent | 5898d76e47144f2366f9acda9ab52827b696c2d5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/ecryptfs-utils/PKGBUILD
community/erlang/PKGBUILD
community/esmtp/PKGBUILD
community/gmic/PKGBUILD
community/ibus-sunpinyin/PKGBUILD
community/libev/PKGBUILD
community/libmirage/PKGBUILD
community/libraw/PKGBUILD
community/lilypond/PKGBUILD
community/luajit/PKGBUILD
community/matchbox-window-manager/PKGBUILD
community/miniupnpc/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/oss/PKGBUILD
community/pidgin-lwqq/PKGBUILD
community/postgis/PKGBUILD
community/python2-pytables/PKGBUILD
community/qmc2/PKGBUILD
community/qtfm/PKGBUILD
community/ruby-gtk3/PKGBUILD
community/tea/PKGBUILD
community/yacpi/PKGBUILD
core/bridge-utils/PKGBUILD
core/gcc/PKGBUILD
core/libsasl/PKGBUILD
core/lvm2/PKGBUILD
core/net-tools/PKGBUILD
core/ppp/PKGBUILD
core/pptpclient/PKGBUILD
core/sdparm/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aisleriot/PKGBUILD
extra/arora/PKGBUILD
extra/bluez-hcidump/PKGBUILD
extra/bluez/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dhcp/PKGBUILD
extra/gnome-bluetooth/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gts/PKGBUILD
extra/guile/PKGBUILD
extra/harfbuzz/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/json-c/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/libatasmart/PKGBUILD
extra/libbsd/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libhangul/PKGBUILD
extra/libindi/PKGBUILD
extra/libpeas/PKGBUILD
extra/libsmbios/PKGBUILD
extra/libspiro/PKGBUILD
extra/libsrtp/PKGBUILD
extra/libxml2/PKGBUILD
extra/libxrender/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/msmtp/PKGBUILD
extra/ortp/PKGBUILD
extra/perl-dbd-sqlite/PKGBUILD
extra/perl-yaml-syck/PKGBUILD
extra/php/PKGBUILD
extra/pm-utils/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt4/PKGBUILD
extra/scim-anthy/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim/PKGBUILD
extra/ssmtp/PKGBUILD
extra/texmacs/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wireshark/PKGBUILD
extra/zsh/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/libretools/libretools.install
libre/mc-libre/PKGBUILD
Diffstat (limited to 'community/fcitx-unikey/PKGBUILD')
0 files changed, 0 insertions, 0 deletions