diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 11:09:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-16 11:09:35 -0300 |
| commit | af1b08b8cb081b88686b319a122aa5dbf096455f (patch) | |
| tree | d896dcd1558fcc8050d3277f8dd3fef8a5c3540f /extra/psiconv/PKGBUILD | |
| parent | 356d47a41ddd831fabc3969a14b6823111516ee3 (diff) | |
| parent | 13759ad562d5a15571c5ffc17217c3871bbe886f (diff) | |
For some reason abslibre-mips64el.git wanted to introduce regressions...
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
community/fceux/PKGBUILD
community/pcsxr/PKGBUILD
extra/lcms2/PKGBUILD
extra/pidgin/PKGBUILD
extra/sip/PKGBUILD
libre/linux-libre/PKGBUILD
social/tinc/PKGBUILD
Diffstat (limited to 'extra/psiconv/PKGBUILD')
0 files changed, 0 insertions, 0 deletions