diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-01 09:30:54 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-01 09:30:54 +0200 |
| commit | de07e6523dc20f8974ff7252fa3cd85889edcd31 (patch) | |
| tree | 68fbecb38319faa111bf4ada3bc10deb2c426d09 /core/net-tools | |
| parent | e1e2e8d3cae181f786ecc988e86152a99ad882a8 (diff) | |
| parent | c623429f33c434cb1cb11974d9e71f48dd5a881f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/picard/PKGBUILD
community/python2-tagpy/PKGBUILD
community/sigil/PKGBUILD
extra/avogadro/PKGBUILD
extra/barcode/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/vigra/PKGBUILD
Diffstat (limited to 'core/net-tools')
0 files changed, 0 insertions, 0 deletions