repo.or.cz
/
qemu
/
kevin.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
history
|
raw
|
HEAD
usb-host: wire up timer for windows
[qemu/kevin.git]
/
tests
/
qapi-schema
/
alternate-conflict-string.json
blob
85adbd4adc1febae280c1fa61258fcabf4f01387
1
# alternate branches of 'str' type conflict with all scalar types
2
{ 'alternate': 'Alt',
3
'data': { 'one': 'str',
4
'two': 'int' } }