summaryrefslogtreecommitdiff
path: root/package/libgcrypt
diff options
context:
space:
mode:
authorwbx <wbx@openadk.org>2011-04-12 19:22:32 +0200
committerwbx <wbx@openadk.org>2011-04-12 19:22:32 +0200
commit933e74c07231e815bbfd9ed90073308eaf253a00 (patch)
treef1733a1feb58ecf8f2d51eb9585edd2ee23f648b /package/libgcrypt
parent0c8fa8e61a481d2d25c55e20c0ebd5176375e623 (diff)
parent819692c26044aa5bb280a08fa017de9d55ca18b9 (diff)
resolve merge conflict
Diffstat (limited to 'package/libgcrypt')
0 files changed, 0 insertions, 0 deletions