diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-04 10:28:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-04 10:28:18 +0200 |
| commit | 8208fc139c28a9334ffebd48a27f4ed77de7ba0d (patch) | |
| tree | 2bac24f6981576e79e7bdd0a5cf567fe4bedf861 /core/iputils | |
| parent | cdd88c937bb1fd3bf6de0b847101524a2d5c9022 (diff) | |
| parent | 96deddcec133f85220a15d4c435004c577395169 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
staging/kdebase-konsole/PKGBUILD
staging/kdeedu-cantor/PKGBUILD
staging/kdeedu-kstars/PKGBUILD
staging/kdeedu-step/PKGBUILD
staging/kdesdk/PKGBUILD
Diffstat (limited to 'core/iputils')
0 files changed, 0 insertions, 0 deletions