diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-10 09:45:26 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-10 09:45:26 +0100 |
commit | 312cbdf40f315e428e8bbc5c5614d8f53f32a39d (patch) | |
tree | 3eddf341e9ee368a338a79aa4e718767daae7046 /extra/kismet | |
parent | a8845d78ab7451363f470cc97c1573707305aee9 (diff) | |
parent | 3792e3874accbc868e7032042f1ecefdef25638e (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/qt/PKGBUILD
gnome-unstable/dconf/PKGBUILD
libre/kdelibs-libre/PKGBUILD
testing/subversion/PKGBUILD
Diffstat (limited to 'extra/kismet')
0 files changed, 0 insertions, 0 deletions