]> git.proxmox.com Git - mirror_qemu.git/commit
Merge branch 'queues/slirp' of git://git.kiszka.org/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 21 Aug 2011 19:19:29 +0000 (19:19 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sun, 21 Aug 2011 19:19:29 +0000 (19:19 +0000)
commitaec7c6dc683314d1e5bed09a9cc98dab086ead82
treec73b76730d8670b2c97c1cd8e57d5479ab8b07ef
parent64ba39af27c0ddaa48fd5625f3109ae81e970e4e
parent1b930bfa098ebad8abfc5ceff5d943133e7513f4
Merge branch 'queues/slirp' of git://git.kiszka.org/qemu

* 'queues/slirp' of git://git.kiszka.org/qemu:
  slirp: Fix bit field types in IP header structs