]> xenbits.xensource.com Git - qemu-upstream-4.2-testing.git/commitdiff
Merge remote-tracking branch 'afaerber/cocoa-for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 22:29:24 +0000 (17:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 22:29:24 +0000 (17:29 -0500)

Trivial merge