diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:08:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:08:57 -0300 |
| commit | 1200fd46a32625f2ac4b035653cb49c22cce6426 (patch) | |
| tree | 0723ee124b40e6e95200ca002f9ae81361ab7919 /extra/xine-ui | |
| parent | 0d0d9e0930114504c15aa8174e2c7d1d2b7a6744 (diff) | |
| parent | fd115d7057eb8243df6edfaf1ed440d6f3e70692 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/iat/PKGBUILD
community/libnsbmp/PKGBUILD
community/libnsgif/PKGBUILD
community/libopenraw/PKGBUILD
community/netsurf/PKGBUILD
core/bison/PKGBUILD
core/perl/PKGBUILD
extra/avahi/PKGBUILD
extra/mutt/PKGBUILD
extra/php/PKGBUILD
Diffstat (limited to 'extra/xine-ui')
0 files changed, 0 insertions, 0 deletions