summaryrefslogtreecommitdiff
path: root/social/ucommon
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-11 10:57:18 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-11 10:57:18 -0300
commitc07ca5cb71d277e9f2fd5c7b94cf8a0021bdfab5 (patch)
treed9d528762b726855cc356781c89abb1768c8be28 /social/ucommon
parentece2137c9569ec806aacf3740df98c399a51b21a (diff)
parent8119da2eaadf53531cad2aed70981ed4606340d6 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/sword/PKGBUILD community/freedroidrpg/PKGBUILD community/pgadmin3/PKGBUILD libre/lame-libre/PKGBUILD testing/dbus-core/PKGBUILD testing/libwebkit/PKGBUILD testing/tracker/PKGBUILD testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch testing/udev/0002-reinstate-TIMEOUT-handling.patch testing/udev/PKGBUILD
Diffstat (limited to 'social/ucommon')
0 files changed, 0 insertions, 0 deletions