summaryrefslogtreecommitdiff
path: root/package/qemu
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-31 09:24:31 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-31 09:24:31 +0100
commit1e9a681a0fc22e40abe393aa9f015a12f7b6dc63 (patch)
tree250019d7025db0f012d830cc7b257b091347f97f /package/qemu
parentbf73dab7201f06f26290c4ceb5cdcca603f027d7 (diff)
parent1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c (diff)
resolve merge conflict
Diffstat (limited to 'package/qemu')
0 files changed, 0 insertions, 0 deletions