summaryrefslogtreecommitdiff
path: root/community/sslh
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-20 18:59:44 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-20 18:59:44 +0100
commit24ac25bb11036f62ff8c578c4d3e3dba5f3dbcef (patch)
tree40446a0370c5278300dbabb70bcface64e7b64a9 /community/sslh
parent27127b7917b98352703db59967e23688e07a5d24 (diff)
parentfecd6286e00e6e25458a7d1b8b80f6fdb236a7a2 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/instead/PKGBUILD community/luasql/PKGBUILD community/qtcreator/PKGBUILD extra/dosfstools/PKGBUILD
Diffstat (limited to 'community/sslh')
0 files changed, 0 insertions, 0 deletions