diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
| commit | 978b7973febf9b1fee624681f33c805e4f04f5dd (patch) | |
| tree | 73ae74deb425418dce2090020d169406e71d5b51 /core/dhcpcd | |
| parent | 6646a7a49f1ff4228204490260b3e0f0e12b5d3c (diff) | |
| parent | a5721a07196cf00c26ea1bfb651aab756d202ccb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxappearance/PKGBUILD
community/menu-cache/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sqlite/PKGBUILD
extra/wireshark/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mdadm/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'core/dhcpcd')
0 files changed, 0 insertions, 0 deletions