diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-14 09:52:50 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-14 09:52:50 +0200 |
| commit | b7f66a52ecf7bd12688286f7ae41a9d3ad22caa4 (patch) | |
| tree | e8da097859d39d5b1529b8833e81dc8bbca45909 /~lukeshu/conkeror-git/conkeror.sh | |
| parent | 74e81d0a23e0ca7480b035c9c388a3e0f033022f (diff) | |
| parent | 8ec4fd7a9e4748c568b20fefcb2dec0f289dc213 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python-psutil/PKGBUILD
extra/timidity++/PKGBUILD
Diffstat (limited to '~lukeshu/conkeror-git/conkeror.sh')
0 files changed, 0 insertions, 0 deletions