tree addcd6c187e2aed6deec88d20b0df99ca3559eec
parent c235d7387c850857ec6b0ba8ee28c7e1548f68c0
parent f97742d0d36810ea72a2bd40b3abb890589ea3b8
author Blue Swirl <blauwirbel@gmail.com> 1308162716 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1308162716 +0000

Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber

* 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber:
  Darwin: Fix compilation warning regarding the deprecated daemon() function
  cocoa: Avoid warning related to multiple handleEvent: definitions
  cocoa: Revert dependency on VNC
  cocoa: Provide central qemu_main() prototype
  Fix libfdt warnings on Darwin
  configure: Fix check for fdatasync()
  Remove warning in printf due to type mismatch
  Cocoa: avoid displaying window when command-line contains '-h' or '-help'
  Fix compilation warning due to incorrectly specified type
  cocoa: do not create a spurious window for -version