diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-21 00:21:21 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-21 00:21:21 -0300 |
| commit | 116249b42ef84d8917a2c8593f7e6b0d3500722e (patch) | |
| tree | cd565bc54690330bce0bfd9fe793c7c3663904a6 /community/libzrtpcpp/PKGBUILD | |
| parent | fcd3ae0df41ddf3667e1c91ce48d31ef6d32e6cb (diff) | |
| parent | a3108a9a809c496e1f6a0e9caf0acebac3889bfb (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
community-testing/virtualbox-modules/virtualbox-modules.install
community/ircii-pana/PKGBUILD
extra/nasm/PKGBUILD
extra/vlc/PKGBUILD
gnome-unstable/baobab/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/evince/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/evolution/evolution.install
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-control-center/PKGBUILD
gnome-unstable/gnome-control-center/gnome-control-center.install
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-font-viewer/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-power-manager/gnome-power-manager.install
gnome-unstable/gnome-screenshot/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
gnome-unstable/gnome-system-log/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgxps/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
gnome-unstable/vte3/PKGBUILD
gnome-unstable/yelp/PKGBUILD
gnome-unstable/yelp/yelp.install
testing/kmod/PKGBUILD
testing/kmod/depmod-search.conf
testing/lirc/PKGBUILD
testing/lirc/lirc.install
testing/openssh/PKGBUILD
testing/xf86-video-neomagic/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'community/libzrtpcpp/PKGBUILD')
0 files changed, 0 insertions, 0 deletions