summaryrefslogtreecommitdiff
path: root/extra/obexftp
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-04-27 10:01:41 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-04-27 10:01:41 +0200
commit05a30322235744d8826965c277e9addef8bd7650 (patch)
tree3dc2d021e9e085ba34e12c8778fe7ca35e9ee612 /extra/obexftp
parent8f88428db7509e434696538e7c757392400d178b (diff)
parenta27a6af53095da314eca1d33911f72775dfc2bce (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/libparserutils/PKGBUILD extra/kdevplatform/PKGBUILD extra/libfontenc/PKGBUILD
Diffstat (limited to 'extra/obexftp')
0 files changed, 0 insertions, 0 deletions