summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-30 13:59:14 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-30 13:59:14 +0200
commitc9f24b5e67b10a25e7ffa9afaefbd6ca76342940 (patch)
treed40774a5451822f227e9b59122fae865b02d0254 /libre-testing
parente7fca19e8659c6c5b6fbb34527b129e655514f1e (diff)
parent08483ba66f8da1bbec05f93e5e3493d3794c02bb (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/cinnamon-control-center/PKGBUILD community/fbshot/PKGBUILD community/fltk2/PKGBUILD community/log4cpp/PKGBUILD community/pion/PKGBUILD
Diffstat (limited to 'libre-testing')
0 files changed, 0 insertions, 0 deletions