diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
commit | 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch) | |
tree | f2d8419cf544c9c1980e49a5a94f19252e17d4e7 /extra/gutenprint | |
parent | 02380099f9ca13810767a2d25742c6862e255852 (diff) | |
parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
community/google-gadgets/PKGBUILD
community/redis/PKGBUILD
community/uzbl/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/ekiga/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gdl/PKGBUILD
extra/glade/PKGBUILD
extra/glibmm/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-nettool/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgda/PKGBUILD
extra/libotr/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libwebkit/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/pangomm/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rasqal/PKGBUILD
extra/redland/PKGBUILD
extra/vte/PKGBUILD
extra/xarchiver/PKGBUILD
extra/yelp/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/mesa/PKGBUILD
testing/rasqal/PKGBUILD
testing/redland/PKGBUILD
Diffstat (limited to 'extra/gutenprint')
0 files changed, 0 insertions, 0 deletions