summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-03 12:50:27 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-03 12:50:27 -0300
commit692010aa202808a5b0ab62a132e5e366e34273fc (patch)
treea2c48fc9ef2c8ae3f6d1ff4f0905c36257fc9707 /testing
parent01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (diff)
parent6c10ff06abb7ca3a4db4c73624f73aafdd3b2e63 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/lightspark/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/shotwell/PKGBUILD
Diffstat (limited to 'testing')
0 files changed, 0 insertions, 0 deletions