diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-04 13:43:14 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-04 13:43:14 -0300 |
| commit | cbba2111ae585b17594535ec01f13bac66937331 (patch) | |
| tree | f097dd36996ae3c7c96c9f91c1dd428670572b80 /extra/phonon-vlc/PKGBUILD | |
| parent | abcaa80b2d3bb539503c485bfea891adc7ffc193 (diff) | |
| parent | 1e6588d64f084decf287a58b7ff93ff0ce4d0446 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/multipath-tools/PKGBUILD
community/perl-gnome2-wnck/PKGBUILD
community/znc/PKGBUILD
core/openldap/PKGBUILD
extra/mod_perl/PKGBUILD
extra/perl-digest-nilsimsa/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/vim/PKGBUILD
extra/xcb-util-keysyms/PKGBUILD
extra/xcb-util-wm/PKGBUILD
extra/xournal/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-libxft/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'extra/phonon-vlc/PKGBUILD')
0 files changed, 0 insertions, 0 deletions