summaryrefslogtreecommitdiff
path: root/package/sane-backends/ipkg
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-24 20:15:39 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-24 20:15:39 +0200
commit57f1ccba214ee4d658fe2bcd61ef51651ade3225 (patch)
treeb18a2c5f6d6fc42a9228daa4cf671f517e5a4a43 /package/sane-backends/ipkg
parentf3e84309257b915cb8820917a8dd5578f02fe974 (diff)
parent6f63961c83bdb1791779975a36ebd28a0de247d6 (diff)
Merge branch 'master' of ssh://openadk.org/git/openadk
fic conflicts Conflicts: package/gnutls/Makefile package/mrd6/Makefile
Diffstat (limited to 'package/sane-backends/ipkg')
0 files changed, 0 insertions, 0 deletions