diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-04 10:44:43 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-04 10:44:43 +0200 |
commit | 64552a84f9eb436e191d738ef4ebc552a768048d (patch) | |
tree | 9a16774f362322e8aa58fc2971593ea690149b87 /~lukeshu | |
parent | aeb7c621efc55ae3b2761257f0fc307f097efec0 (diff) | |
parent | 5f3b2100b811506bec6bcf63b24d1c605dfe8cb6 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/gnome-nettool/PKGBUILD
Diffstat (limited to '~lukeshu')
0 files changed, 0 insertions, 0 deletions