Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber
commit58b5f5e029207632b93bd211e746cf85d59c00ca
authorBlue Swirl <blauwirbel@gmail.com>
Tue, 1 May 2012 09:29:23 +0000 (1 09:29 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Tue, 1 May 2012 09:29:23 +0000 (1 09:29 +0000)
tree5c4b5ed65df2a6fde68fa131993b8928385f3e8e
parentee6610785e4979770409fc675f7d889aa390aae5
parent0adb124659cfadf9f0b5c99874c476116f0cf74f
Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber

* 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber:
  Drop darwin-user
  configure: add '--disable-cocoa' switch
  raw-posix: Do not use CONFIG_COCOA macro
MAINTAINERS
Makefile.target