diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-28 12:05:35 +0100 |
| commit | 7cd4823a20b85a5e516ae51fc04a4d1b72b5d0b9 (patch) | |
| tree | 31c86c3a5284a8b8a7f1720d27ce9e5dbf09fee4 /extra/fping | |
| parent | d17a0ec458b03b0ed38eff13d399567f36156a73 (diff) | |
| parent | 1f567a9d58d16b76320168f0624aa55bd6320284 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cairo-clock/PKGBUILD
community/flashrom/PKGBUILD
community/kmess/PKGBUILD
core/tzdata/PKGBUILD
extra/gc/PKGBUILD
extra/libsigc++/PKGBUILD
extra/libxcomposite/PKGBUILD
extra/libxdmcp/PKGBUILD
extra/libxevie/PKGBUILD
extra/libxext/PKGBUILD
extra/libxinerama/PKGBUILD
extra/libxkbfile/PKGBUILD
extra/libxpm/PKGBUILD
extra/libxres/PKGBUILD
extra/libxss/PKGBUILD
extra/libxt/PKGBUILD
extra/libxtst/PKGBUILD
extra/libxv/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/pdns-recursor/PKGBUILD
extra/pdns/PKGBUILD
extra/procmail/PKGBUILD
extra/ptlib/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pyorbit/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-battery-plugin/PKGBUILD
Diffstat (limited to 'extra/fping')
0 files changed, 0 insertions, 0 deletions