diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-17 16:22:58 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-17 16:22:58 -0300 |
| commit | 184903e07aa7b573b0acf162424afc969c07bd4b (patch) | |
| tree | 538ba187cfb866efc3e1bb23be668882b8a5bb44 /core/zlib | |
| parent | 3138d10936c63dc6444ac0dc55dd08b722b82309 (diff) | |
| parent | 68998b64e2d81f7e77184b7f23ee141da1d0e2ff (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/hostapd/PKGBUILD
community-testing/hostapd/config.bz2
community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch
community-testing/hostapd/hostapd
community-testing/hostapd/hostapd.conf.d
community-testing/hostapd/hostapd.install
community-testing/ipvsadm/PKGBUILD
community-testing/ipvsadm/ipvsadm.conf
community-testing/ipvsadm/ipvsadm.rc
community-testing/ipvsadm/ipvsadm.rules
community-testing/keepalived/PKGBUILD
community-testing/keepalived/ip_vs_moved.patch
community-testing/keepalived/keepalived.conf
community-testing/keepalived/keepalived.rc
community-testing/knemo/PKGBUILD
community-testing/knemo/knemo.install
community-testing/simh/LICENSE
community-testing/simh/PKGBUILD
community-testing/simh/simh.install
community/fityk/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/sage-mathematics/PKGBUILD
community/xylib/PKGBUILD
core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
extra/kradio/PKGBUILD
extra/phonon-gstreamer/PKGBUILD
extra/phonon-vlc/PKGBUILD
testing/bluez/PKGBUILD
testing/bluez/bluetooth.conf.d
testing/bluez/fix-a2dp.patch
testing/bluez/rc.bluetooth
testing/crda/PKGBUILD
testing/crda/crda.install
testing/crda/crda.rc
testing/crda/libnl32.patch
testing/iw/PKGBUILD
testing/kismet/PKGBUILD
testing/kismet/kismet.changelog
testing/kismet/kismet.install
testing/libnl/PKGBUILD
testing/libnl1/PKGBUILD
testing/libnl1/fix-compilation.patch
testing/libpcap/PKGBUILD
testing/libpcap/libnl32.patch
testing/net-snmp/PKGBUILD
testing/net-snmp/libnl32.patch
testing/net-snmp/snmpd.confd
testing/net-snmp/snmpd.rc
testing/networkmanager/NetworkManager.conf
testing/networkmanager/PKGBUILD
testing/networkmanager/disable_set_hostname.patch
testing/networkmanager/networkmanager.install
testing/ntrack/PKGBUILD
testing/ntrack/libnl3.patch
testing/wpa_supplicant/PKGBUILD
testing/wpa_supplicant/config
testing/wpa_supplicant/dbus.patch
testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
Diffstat (limited to 'core/zlib')
0 files changed, 0 insertions, 0 deletions