summaryrefslogtreecommitdiff
path: root/package/xcmiscproto
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-10 11:03:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-10 11:03:58 +0100
commit94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch)
tree22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/xcmiscproto
parenta217fc80b29080dae963bb15051df023de36ce39 (diff)
parent16d94117a716fc361d3db9a2a17cf4c45eab837d (diff)
resolve conflicts
Diffstat (limited to 'package/xcmiscproto')
0 files changed, 0 insertions, 0 deletions