diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-10 15:50:09 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-10 15:50:09 -0300 |
commit | 678a7a4fb762d6669c9c2105b78d107aeebe163e (patch) | |
tree | ff00f3107491221d314e82982159160e1fa15778 /extra/networkmanager | |
parent | f5cfd603b3511e75e414558f6cc9c10f8af0b750 (diff) | |
parent | 2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/haskell-stm/PKGBUILD
community-staging/haskell-syb/PKGBUILD
community/cantata/PKGBUILD
community/linux-tools/PKGBUILD
community/python-pymongo/PKGBUILD
core/less/PKGBUILD
extra/alsa-plugins/PKGBUILD
extra/avfs/PKGBUILD
extra/cups/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdemultimedia-mplayerthumbs/PKGBUILD
extra/kdepim/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mysql/PKGBUILD
extra/ocaml/PKGBUILD
extra/sqlite/PKGBUILD
extra/vim/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
multilib/lib32-alsa-lib/PKGBUILD
multilib/lib32-alsa-plugins/PKGBUILD
multilib/lib32-fontconfig/PKGBUILD
staging/ghc/PKGBUILD
staging/ghc/build.mk
staging/haskell-http/PKGBUILD
staging/haskell-mtl/PKGBUILD
staging/haskell-network/PKGBUILD
staging/haskell-parsec/PKGBUILD
staging/haskell-random/PKGBUILD
staging/haskell-text/PKGBUILD
staging/haskell-transformers/PKGBUILD
staging/haskell-zlib/PKGBUILD
testing/coreutils/PKGBUILD
testing/coreutils/coreutils.install
testing/dhcpcd/PKGBUILD
testing/kactivities/PKGBUILD
testing/kdeaccessibility-jovie/PKGBUILD
testing/kdeaccessibility-kaccessible/PKGBUILD
testing/kdeaccessibility-kmag/PKGBUILD
testing/kdeaccessibility-kmousetool/PKGBUILD
testing/kdeaccessibility-kmouth/PKGBUILD
testing/kdeadmin/PKGBUILD
testing/kdeartwork/PKGBUILD
testing/kdebase-konsole/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase/PKGBUILD
testing/kdebindings-kimono/PKGBUILD
testing/kdebindings-korundum/PKGBUILD
testing/kdebindings-kross/PKGBUILD
testing/kdebindings-perlkde/PKGBUILD
testing/kdebindings-perlqt/PKGBUILD
testing/kdebindings-python/PKGBUILD
testing/kdebindings-qtruby/PKGBUILD
testing/kdebindings-qyoto/PKGBUILD
testing/kdebindings-smokegen/PKGBUILD
testing/kdebindings-smokekde/PKGBUILD
testing/kdebindings-smokeqt/PKGBUILD
testing/kdeedu-analitza/PKGBUILD
testing/kdeedu-blinken/PKGBUILD
testing/kdeedu-cantor/PKGBUILD
testing/kdeedu-kalgebra/PKGBUILD
testing/kdeedu-kalzium/PKGBUILD
testing/kdeedu-kanagram/PKGBUILD
testing/kdeedu-kbruch/PKGBUILD
testing/kdeedu-kgeography/PKGBUILD
testing/kdeedu-khangman/PKGBUILD
testing/kdeedu-kig/PKGBUILD
testing/kdeedu-kiten/PKGBUILD
testing/kdeedu-klettres/PKGBUILD
testing/kdeedu-kmplot/PKGBUILD
testing/kdeedu-kstars/PKGBUILD
testing/kdeedu-ktouch/PKGBUILD
testing/kdeedu-kturtle/PKGBUILD
testing/kdeedu-kwordquiz/PKGBUILD
testing/kdeedu-marble/PKGBUILD
testing/kdeedu-pairs/PKGBUILD
testing/kdeedu-parley/PKGBUILD
testing/kdeedu-rocs/PKGBUILD
testing/kdeedu-step/PKGBUILD
testing/kdegames/PKGBUILD
testing/kdegraphics-gwenview/PKGBUILD
testing/kdegraphics-kamera/PKGBUILD
testing/kdegraphics-kcolorchooser/PKGBUILD
testing/kdegraphics-kgamma/PKGBUILD
testing/kdegraphics-kolourpaint/PKGBUILD
testing/kdegraphics-kruler/PKGBUILD
testing/kdegraphics-ksaneplugin/PKGBUILD
testing/kdegraphics-ksnapshot/PKGBUILD
testing/kdegraphics-mobipocket/PKGBUILD
testing/kdegraphics-okular/PKGBUILD
testing/kdegraphics-strigi-analyzer/PKGBUILD
testing/kdegraphics-svgpart/PKGBUILD
testing/kdegraphics-thumbnailers/PKGBUILD
testing/kdemultimedia-audiocd-kio/PKGBUILD
testing/kdemultimedia-dragonplayer/PKGBUILD
testing/kdemultimedia-ffmpegthumbs/PKGBUILD
testing/kdemultimedia-juk/PKGBUILD
testing/kdemultimedia-kmix/PKGBUILD
testing/kdemultimedia-kscd/PKGBUILD
testing/kdemultimedia-mplayerthumbs/PKGBUILD
testing/kdenetwork/PKGBUILD
testing/kdepim-runtime/PKGBUILD
testing/kdepim/PKGBUILD
testing/kdepimlibs/PKGBUILD
testing/kdeplasma-addons/PKGBUILD
testing/kdesdk-kate/PKGBUILD
testing/kdesdk/PKGBUILD
testing/kdetoys/PKGBUILD
testing/kdeutils-filelight/PKGBUILD
testing/kdeutils-kcalc/PKGBUILD
testing/kdeutils-kcharselect/PKGBUILD
testing/kdeutils-kdf/PKGBUILD
testing/kdeutils-kfloppy/PKGBUILD
testing/kdeutils-kgpg/PKGBUILD
testing/kdeutils-kremotecontrol/PKGBUILD
testing/kdeutils-ktimer/PKGBUILD
testing/kdeutils-kwallet/PKGBUILD
testing/kdeutils-superkaramba/PKGBUILD
testing/kdeutils-sweeper/PKGBUILD
testing/kdewebdev/PKGBUILD
testing/kmod/PKGBUILD
testing/libkcddb/PKGBUILD
testing/libkcompactdisc/PKGBUILD
testing/libkdcraw/PKGBUILD
testing/libkdeedu/PKGBUILD
testing/libkexiv2/PKGBUILD
testing/libkipi/PKGBUILD
testing/libksane/PKGBUILD
testing/libmpc/PKGBUILD
testing/nepomuk-core/PKGBUILD
testing/procps-ng/PKGBUILD
testing/sudo/PKGBUILD
testing/sysvinit/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/networkmanager')
0 files changed, 0 insertions, 0 deletions