summaryrefslogtreecommitdiff
path: root/community/ksshaskpass/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-04-02 18:56:43 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-04-02 18:56:43 +0200
commit16962179f9ea5c2875d55693396413b6e9bf8b6d (patch)
tree860d1ef78293947182f45a9e21021a27a26ced80 /community/ksshaskpass/PKGBUILD
parent4d800cff6e1b6460f7f4a7e737077c9064b0ed37 (diff)
parent321f44e3a5da426309c4b6664af035c97f907565 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/go/PKGBUILD core/openssl/PKGBUILD extra/libsigsegv/PKGBUILD gnome-unstable/gnome-control-center/PKGBUILD staging/boost/PKGBUILD staging/kactivities/PKGBUILD staging/kdeaccessibility-jovie/PKGBUILD staging/kdeaccessibility-kaccessible/PKGBUILD staging/kdeaccessibility-kmag/PKGBUILD staging/kdeaccessibility-kmousetool/PKGBUILD staging/kdeaccessibility-kmouth/PKGBUILD staging/kdeadmin/PKGBUILD staging/kdeartwork/PKGBUILD staging/kdebase-konsole/PKGBUILD staging/kdebase-runtime/PKGBUILD staging/kdebase-workspace/PKGBUILD staging/kdebase-workspace/kde-np.pam staging/kdebase-workspace/kde.pam staging/kdebase/PKGBUILD staging/kdebindings-kimono/PKGBUILD staging/kdebindings-korundum/PKGBUILD staging/kdebindings-kross/PKGBUILD staging/kdebindings-perlkde/PKGBUILD staging/kdebindings-perlqt/PKGBUILD staging/kdebindings-python/PKGBUILD staging/kdebindings-qtruby/PKGBUILD staging/kdebindings-qyoto/PKGBUILD staging/kdebindings-smokegen/PKGBUILD staging/kdebindings-smokekde/PKGBUILD staging/kdebindings-smokeqt/PKGBUILD staging/kdeedu-analitza/PKGBUILD staging/kdeedu-blinken/PKGBUILD staging/kdeedu-cantor/PKGBUILD staging/kdeedu-kalgebra/PKGBUILD staging/kdeedu-kalzium/PKGBUILD staging/kdeedu-kanagram/PKGBUILD staging/kdeedu-kbruch/PKGBUILD staging/kdeedu-kgeography/PKGBUILD staging/kdeedu-khangman/PKGBUILD staging/kdeedu-kig/PKGBUILD staging/kdeedu-kiten/PKGBUILD staging/kdeedu-klettres/PKGBUILD staging/kdeedu-kmplot/PKGBUILD staging/kdeedu-kstars/PKGBUILD staging/kdeedu-ktouch/PKGBUILD staging/kdeedu-kturtle/PKGBUILD staging/kdeedu-kwordquiz/PKGBUILD staging/kdeedu-marble/PKGBUILD staging/kdeedu-parley/PKGBUILD staging/kdeedu-rocs/PKGBUILD staging/kdeedu-step/PKGBUILD staging/kdegames/PKGBUILD staging/kdegraphics-gwenview/PKGBUILD staging/kdegraphics-kamera/PKGBUILD staging/kdegraphics-kcolorchooser/PKGBUILD staging/kdegraphics-kgamma/PKGBUILD staging/kdegraphics-kolourpaint/PKGBUILD staging/kdegraphics-kruler/PKGBUILD staging/kdegraphics-ksaneplugin/PKGBUILD staging/kdegraphics-ksnapshot/PKGBUILD staging/kdegraphics-mobipocket/PKGBUILD staging/kdegraphics-okular/PKGBUILD staging/kdegraphics-strigi-analyzer/PKGBUILD staging/kdegraphics-svgpart/PKGBUILD staging/kdegraphics-thumbnailers/PKGBUILD staging/kdemultimedia/PKGBUILD staging/kdenetwork/PKGBUILD staging/kdepim-runtime/PKGBUILD staging/kdepim/PKGBUILD staging/kdepimlibs/PKGBUILD staging/kdeplasma-addons/PKGBUILD staging/kdesdk-kate/PKGBUILD staging/kdesdk/PKGBUILD staging/kdetoys/PKGBUILD staging/kdeutils-filelight/PKGBUILD staging/kdeutils-kcalc/PKGBUILD staging/kdeutils-kcharselect/PKGBUILD staging/kdeutils-kdf/PKGBUILD staging/kdeutils-kfloppy/PKGBUILD staging/kdeutils-kgpg/PKGBUILD staging/kdeutils-kremotecontrol/PKGBUILD staging/kdeutils-ksecrets/PKGBUILD staging/kdeutils-ktimer/PKGBUILD staging/kdeutils-kwallet/PKGBUILD staging/kdeutils-superkaramba/PKGBUILD staging/kdeutils-sweeper/PKGBUILD staging/kdewebdev/PKGBUILD staging/libkdcraw/PKGBUILD staging/libkdeedu/PKGBUILD staging/libkexiv2/PKGBUILD staging/libkipi/PKGBUILD staging/libksane/PKGBUILD testing/e2fsprogs/PKGBUILD testing/iptables/PKGBUILD testing/ruby/PKGBUILD testing/xorg-server/PKGBUILD testing/xorg-server/autoconfig-nvidia.patch testing/xorg-server/autoconfig-sis.patch
Diffstat (limited to 'community/ksshaskpass/PKGBUILD')
0 files changed, 0 insertions, 0 deletions