summaryrefslogtreecommitdiff
path: root/extra/pangomm
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-05 02:43:51 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-05 02:43:51 -0300
commit61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch)
tree6b8b6fb14ede5aae651e92f593252dba143cee74 /extra/pangomm
parentca998b4c054452abed4e01be1d2b28fee0ca904f (diff)
parent5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/camlp5/PKGBUILD community/coq/PKGBUILD community/ldns/PKGBUILD community/luxrays/PKGBUILD community/luxrender/PKGBUILD community/nut/PKGBUILD community/root/PKGBUILD community/swi-prolog/PKGBUILD community/vtk/PKGBUILD community/wings3d/wings3d.sh core/sqlite3/PKGBUILD core/tzdata/PKGBUILD extra/cmus/PKGBUILD extra/dcron/PKGBUILD extra/farsight2/PKGBUILD extra/foomatic/PKGBUILD extra/fwbuilder/PKGBUILD extra/gnome-utils/PKGBUILD extra/ivtv-utils/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdesdk/PKGBUILD extra/koffice/PKGBUILD extra/libxfce4menu/PKGBUILD extra/openmpi/PKGBUILD extra/telepathy-butterfly/PKGBUILD extra/telepathy-farsight/PKGBUILD extra/telepathy-kde-presence-dataengine/PKGBUILD extra/telepathy-qt4/PKGBUILD extra/xfce-utils/PKGBUILD extra/xulrunner/PKGBUILD multilib/lib32-zlib/PKGBUILD staging/gimp-devel/gimp-devel.install testing/gtk3/PKGBUILD testing/php/PKGBUILD ~xihh/couchdb-git/couchdb.install ~xihh/couchdb-git/rc-script.patch ~xihh/gmime24/PKGBUILD
Diffstat (limited to 'extra/pangomm')
0 files changed, 0 insertions, 0 deletions