Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber
authorBlue Swirl <blauwirbel@gmail.com>
Tue, 1 May 2012 09:29:23 +0000 (09:29 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Tue, 1 May 2012 09:29:23 +0000 (09:29 +0000)
* '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

1  2 
MAINTAINERS
Makefile.target

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile.target
Simple merge