summaryrefslogtreecommitdiff
path: root/package/libgcrypt/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:57:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-21 20:57:35 +0200
commit4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch)
tree21e5b36849ea23f526cc58578a540de3882d7376 /package/libgcrypt/Makefile
parent8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff)
parent38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff)
resolve merge conflict
Diffstat (limited to 'package/libgcrypt/Makefile')
0 files changed, 0 insertions, 0 deletions