diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
| commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
| tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /community/twinkle | |
| parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
| parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'community/twinkle')
0 files changed, 0 insertions, 0 deletions