summaryrefslogtreecommitdiff
path: root/community/recoll
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-04-17 10:22:56 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-04-17 10:22:56 +0200
commit16d51ac66fa18675d49ef64f4a3c1dbe53b5711a (patch)
tree90b40c53d4904cf506c7ee3e45455ff97782fa66 /community/recoll
parent0be48442ebb71571ec0ab1bbf27bf4a0759ed19b (diff)
parent0fb510ac9b1defac6c3d54a68eccd7e18635b474 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/dee/PKGBUILD community-testing/openttd/PKGBUILD extra/llvm/PKGBUILD testing/calligra/PKGBUILD testing/gdk-pixbuf2/PKGBUILD testing/gdk-pixbuf2/gdk-pixbuf2.install testing/gdm/PKGBUILD testing/gnome-screensaver/PKGBUILD testing/gnome-screensaver/gnome-screensaver.install testing/xf86-video-ati/PKGBUILD
Diffstat (limited to 'community/recoll')
0 files changed, 0 insertions, 0 deletions