]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 642cfd4 2f9cba0)
Merge branch 'patches' of git://qemu.weilnetz.de/git/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Fri, 29 Apr 2011 20:01:51 +0000 (20:01 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Fri, 29 Apr 2011 20:01:51 +0000 (20:01 +0000)
* 'patches' of git://qemu.weilnetz.de/git/qemu:
  qemu-timer: Fix timers for w32
  qemu-timer: Avoid type casts
  qemu-timer: Remove unneeded include statement (w32)
  qemu-timer: Add and use new function qemu_timer_expired_ns


Trivial merge
Qemu copy for testing