diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-08 13:40:51 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-08 13:40:51 -0300 |
| commit | 1eb44cdc16d2ce4e40d42cacea7456ad245994f1 (patch) | |
| tree | 8fffd10c72c5c326bcc41cdbbafda13c0ec5b2b6 /extra/telepathy-kde-accounts-kcm-plugins | |
| parent | 69d3aee0c3f0bb876065264baccf86c13088dd01 (diff) | |
| parent | 8cca36c97b57b8d0a7e5521647c02409eb94ade4 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/portaudio/PKGBUILD
extra/ettercap/PKGBUILD
extra/kdelibs/PKGBUILD
extra/qt/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/pulseaudio/PKGBUILD
gnome-unstable/vala/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
testing/xf86-video-glint/PKGBUILD
Diffstat (limited to 'extra/telepathy-kde-accounts-kcm-plugins')
0 files changed, 0 insertions, 0 deletions