diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-04 10:10:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-04 10:10:35 -0300 |
| commit | b9ab7ef683fd366635faca49342ee005846037ab (patch) | |
| tree | 3bb0ff57a43d068e85dc5318887f700b071c7f8f /extra/amarok/PKGBUILD | |
| parent | 7046a475b24925c0ec7816ef7d2cdcf3b9cd4eb0 (diff) | |
| parent | ab1410d33401cf1fc4a384bb0b2d9901c8fe8d14 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gimmie/PKGBUILD
community/glipper-old/PKGBUILD
community/glipper/PKGBUILD
community/lcms2/PKGBUILD
community/libpanelappletmm/PKGBUILD
community/panflute/PKGBUILD
community/sensors-applet/PKGBUILD
community/wtf/PKGBUILD
community/xmonad-log-applet/PKGBUILD
core/binutils/PKGBUILD
core/tzdata/PKGBUILD
extra/a52dec/PKGBUILD
extra/aubio/PKGBUILD
extra/automoc4/PKGBUILD
extra/deskbar-applet/PKGBUILD
extra/eject/PKGBUILD
extra/ekiga/PKGBUILD
extra/gnome-netstatus/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/htdig/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libgail-gnome/PKGBUILD
extra/libktorrent/PKGBUILD
extra/libofa/PKGBUILD
extra/netspeed-applet/PKGBUILD
extra/openexr/PKGBUILD
extra/postgresql/PKGBUILD
extra/pulseaudio-mixer-applet/PKGBUILD
extra/seahorse-plugins/PKGBUILD
extra/telepathy-qt4/PKGBUILD
libre/kernel26-libre/PKGBUILD
testing/libtool/PKGBUILD
testing/xfsprogs/PKGBUILD
Diffstat (limited to 'extra/amarok/PKGBUILD')
0 files changed, 0 insertions, 0 deletions