summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-14 14:20:24 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-14 14:20:24 +0100
commit20553d4814291e0960f86db52ff7d939241ff1d7 (patch)
tree8163d4cee334e471830714257e6df81d18a0ad1c /libre-testing
parentd51e9b973c5e554869e188fdc65106728c95c0c7 (diff)
parent1b9faba25721b73f30e49f0cea9c7346eedd0f73 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/netsurf/PKGBUILD extra/python/PKGBUILD extra/python2/PKGBUILD
Diffstat (limited to 'libre-testing')
0 files changed, 0 insertions, 0 deletions