diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-05 14:32:52 -0300 |
| commit | 2699a201e0f70a2e1c2f7a0cab8725321649893d (patch) | |
| tree | b9f1b7eaa65592b658bb922714a975725e244d3c /extra/freetype2 | |
| parent | 8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff) | |
| parent | 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bacula/PKGBUILD
community/clementine/PKGBUILD
community/dbus-sharp-glib/PKGBUILD
community/dockmanager/PKGBUILD
community/docky/PKGBUILD
community/flightgear-atlas/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/openmovieeditor/PKGBUILD
community/perl-crypt-openssl-bignum/PKGBUILD
community/perl-crypt-openssl-random/PKGBUILD
community/perl-crypt-openssl-rsa/PKGBUILD
community/tucan/PKGBUILD
core/btrfs-progs-unstable/PKGBUILD
core/module-init-tools/PKGBUILD
core/sqlite3/PKGBUILD.mips64el
extra/bogofilter/PKGBUILD
extra/dirmngr/PKGBUILD
extra/gluezilla/PKGBUILD
extra/gnupg/PKGBUILD
extra/gnupg2/PKGBUILD
extra/gpgme/PKGBUILD
extra/kdeaccessibility/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libassuan/PKGBUILD
extra/libksba/PKGBUILD
extra/oxygen-gtk/PKGBUILD
extra/pinentry/PKGBUILD
extra/pth/PKGBUILD
extra/smplayer-themes/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/linux-libre.preset.mips64el
Diffstat (limited to 'extra/freetype2')
0 files changed, 0 insertions, 0 deletions