summaryrefslogtreecommitdiff
path: root/extra/zeitgeist/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-08-03 13:40:53 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-08-03 13:40:53 +0200
commitcac6c854c6777f9c69230e8cf4a08c25f6b981cf (patch)
tree5f6d013bde41fb361e5d6f736b6531e5bb47cd34 /extra/zeitgeist/PKGBUILD
parent5fcf983414b164c522a9ba73df27b13d28cde35b (diff)
parent60f7eab28ba0dd57c8ce519609f393dd3931b621 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: multilib/lib32-libcups/PKGBUILD multilib/lib32-mesa/PKGBUILD multilib/lib32-qt/PKGBUILD multilib/wine_gecko/PKGBUILD staging/kdebase-runtime/PKGBUILD staging/kdegraphics-gwenview/PKGBUILD staging/libkexiv2/PKGBUILD testing/akonadi/PKGBUILD testing/k3b/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/kdebindings-python/PKGBUILD testing/kdeedu-kig/PKGBUILD testing/kdeedu-rocs/PKGBUILD testing/openldap/PKGBUILD testing/openldap/slapd
Diffstat (limited to 'extra/zeitgeist/PKGBUILD')
0 files changed, 0 insertions, 0 deletions