summaryrefslogtreecommitdiff
path: root/extra/networkmanager/dont-fight-over-ipv6.patch
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
commit36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch)
tree397141926cac78871a3e9d53cd8fb824bc1b9cd3 /extra/networkmanager/dont-fight-over-ipv6.patch
parent0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff)
parent5827948456201df72a1bd73e87977c569129fb27 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/percona-server/PKGBUILD community/xmlrpc-c/PKGBUILD core/util-linux/PKGBUILD extra/colord/PKGBUILD extra/epiphany/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/gcr/PKGBUILD extra/gdm/PKGBUILD extra/gnome-color-manager/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-dictionary/PKGBUILD extra/gnome-font-viewer/PKGBUILD extra/gnome-screenshot/PKGBUILD extra/gnome-search-tool/PKGBUILD extra/gnome-system-log/PKGBUILD extra/gobject-introspection/PKGBUILD extra/grilo/PKGBUILD extra/gtkmm3/PKGBUILD extra/gvfs/PKGBUILD extra/json-glib/PKGBUILD extra/libgnome-keyring/PKGBUILD extra/nautilus-open-terminal/PKGBUILD extra/pidgin/PKGBUILD extra/pygobject/PKGBUILD extra/rest/PKGBUILD extra/rhythmbox/PKGBUILD extra/seahorse/PKGBUILD extra/totem/PKGBUILD extra/xorg-xinit/PKGBUILD extra/yelp/PKGBUILD
Diffstat (limited to 'extra/networkmanager/dont-fight-over-ipv6.patch')
0 files changed, 0 insertions, 0 deletions