summaryrefslogtreecommitdiff
path: root/extra/networkmanager/networkmanager.install
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-06-16 12:30:02 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-06-16 12:30:02 +0200
commitfb62b6371fdc9ffe50d30c698f13ea1fb39c215b (patch)
treeb65df8847849e9c0e61f6dbec966948b102e14fa /extra/networkmanager/networkmanager.install
parent17816ffb0849295b8a1ee5fecb008f3a26bf0545 (diff)
parentf186b4cb8562b60dd4e1f5331f248caf547c8839 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/perl-params-util/PKGBUILD extra/xfce4-mixer/PKGBUILD kde-unstable/libkcddb/PKGBUILD staging/xine-lib/PKGBUILD
Diffstat (limited to 'extra/networkmanager/networkmanager.install')
0 files changed, 0 insertions, 0 deletions