diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 23:55:37 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 23:55:37 -0300 |
| commit | 2d0e587bd1c7ac060a95a0e20cfe00ab19db7e14 (patch) | |
| tree | 66a82d2834fe42b3411c09ad9fdcc4bd6af079ac /community/xmms2/PKGBUILD | |
| parent | 6aa1c22fe01ff4df6c5f75fd04d551b53f7df389 (diff) | |
| parent | 44ded298ebb49500d321ac79b7d0d8bb4d5058ec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gnupg/PKGBUILD
core/openldap/PKGBUILD
gnome-unstable/evince/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/farstream/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libwacom/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/networkmanager-openconnect/PKGBUILD
gnome-unstable/networkmanager-openvpn/PKGBUILD
gnome-unstable/networkmanager-pptp/PKGBUILD
gnome-unstable/networkmanager-vpnc/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/gnupg/PKGBUILD
Diffstat (limited to 'community/xmms2/PKGBUILD')
0 files changed, 0 insertions, 0 deletions