summaryrefslogtreecommitdiff
path: root/community-staging
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-01-31 10:53:52 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-01-31 10:53:52 +0100
commit5330206481631dda2c1e585b758c58f90ab807ee (patch)
tree963af2f017ae97a614bb4a1620dba3c8fccc4a1b /community-staging
parentde041df147ce2040490c5606f95dcacdd0ceb04c (diff)
parent902eddd7e029eda6fc1c668b31e696c6ca3edbc7 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/xorg-server/PKGBUILD multilib-staging/lib32-pango/PKGBUILD multilib/lib32-gtk2/PKGBUILD staging/digikam/PKGBUILD testing/udev/PKGBUILD
Diffstat (limited to 'community-staging')
0 files changed, 0 insertions, 0 deletions