summaryrefslogtreecommitdiff
path: root/extra/libunique
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-04-30 10:55:42 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-04-30 10:55:42 +0200
commitd9a9508e07a00015e2a2f278719a9665ff565961 (patch)
tree97ddb1c2607a58c2a632da571b281641dfdf9df2 /extra/libunique
parent0a2ba65e7cf7d8d0452654b2f25cbb84a89fe7cf (diff)
parentb7cd4b184f75d3d2b54b356e08f296df3a9afb38 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/buoh/PKGBUILD core/openssl/PKGBUILD extra/llvm/PKGBUILD extra/pulseaudio/PKGBUILD extra/pygobject/PKGBUILD extra/pygobject2/PKGBUILD multilib/lib32-util-linux/PKGBUILD testing/consolekit/PKGBUILD testing/gnome-keyring/PKGBUILD testing/lirc/PKGBUILD testing/samba/PKGBUILD testing/systemd/PKGBUILD
Diffstat (limited to 'extra/libunique')
0 files changed, 0 insertions, 0 deletions