diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-22 11:26:53 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-22 11:26:53 +0100 |
commit | 50a468d0a3c5555c9e6889696bd0397f17a6974c (patch) | |
tree | 8d8b7bc211e7e2b5a91c25c86c5b7ae58e9e4a52 /gnome-unstable/networkmanager/NetworkManager.conf | |
parent | bf6c93db356044781e343fe26da74d357b4beda3 (diff) | |
parent | 6b3123e5628817e3cef9c44989dffd21c49b0817 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cksfv/PKGBUILD
extra/clutter-gtk2/PKGBUILD
extra/gnuplot/PKGBUILD
extra/mx/PKGBUILD
Diffstat (limited to 'gnome-unstable/networkmanager/NetworkManager.conf')
0 files changed, 0 insertions, 0 deletions