diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-03 12:50:27 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-03 12:50:27 -0300 |
commit | 692010aa202808a5b0ab62a132e5e366e34273fc (patch) | |
tree | a2c48fc9ef2c8ae3f6d1ff4f0905c36257fc9707 /community/caph/caph.desktop | |
parent | 01dfa0016c313f5ec5be0a8b624bac5031ff74a8 (diff) | |
parent | 6c10ff06abb7ca3a4db4c73624f73aafdd3b2e63 (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 'community/caph/caph.desktop')
0 files changed, 0 insertions, 0 deletions