aboutsummaryrefslogtreecommitdiff
path: root/ui/cocoa.m
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-30 10:51:47 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-30 10:51:47 -0600
commit321f211707822b4c87f0bb89e4f46586fff43163 (patch)
tree1eed37bdbcf7f4b9da3b48d9fd14019c6b0b4dc7 /ui/cocoa.m
parentb0df98f3a2968eb5aba3075d1cf9b1a3931907e0 (diff)
parentf61850bffbd0bb8b15aa55ebc3470bf1f8ce8664 (diff)
Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
# By Christoffer Dall (1) and Peter Maydell (1) # Via Peter Maydell * pmaydell/arm-devs.next: hw/vexpress: Use correct HBI (board model number) for vexpress-a15 hw/arm_sysctl: Clear sysctl cfgctrl start bit
Diffstat (limited to 'ui/cocoa.m')
0 files changed, 0 insertions, 0 deletions