diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-19 11:44:15 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-19 11:44:15 +0200 |
| commit | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (patch) | |
| tree | af56a7953cb3e5e4619535b1509b85fec5408505 /extra/avahi | |
| parent | 32ead4093d89e260920e5bb604e7eeeeff26e725 (diff) | |
| parent | 85ca6bfccdec6939881572fb1154f1a07d54937c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssl/PKGBUILD
testing/at-spi2-core/PKGBUILD
testing/brasero/PKGBUILD
testing/brasero/brasero.install
testing/cheese/PKGBUILD
testing/cheese/cheese.install
testing/clutter/PKGBUILD
testing/eog/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/gdm-autologin.pam
testing/gdm/gdm-fingerprint.pam
testing/gdm/gdm-password.pam
testing/gdm/gdm-smartcard.pam
testing/gedit/PKGBUILD
testing/gedit/gedit.install
testing/glib-networking/PKGBUILD
testing/glib-networking/glib-networking.install
testing/gnome-online-accounts/PKGBUILD
testing/gnome-screenshot/PKGBUILD
testing/gnome-system-log/PKGBUILD
testing/gnome-system-monitor/PKGBUILD
testing/gnome-system-monitor/gnome-system-monitor.install
testing/gobject-introspection/PKGBUILD
testing/gucharmap/PKGBUILD
testing/gucharmap/gucharmap.install
testing/libsoup/PKGBUILD
testing/nautilus/PKGBUILD
testing/nautilus/nautilus.install
testing/tomboy/PKGBUILD
testing/tomboy/tomboy.install
testing/vinagre/PKGBUILD
testing/vinagre/vinagre.install
testing/vino/PKGBUILD
testing/vino/vino.install
Diffstat (limited to 'extra/avahi')
0 files changed, 0 insertions, 0 deletions