| commit | e7bd5f06431a9c0a1b3e5b5c757318c77deb2879 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 14 Oct 2009 21:41:14 +0000 (14 18:41 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Wed, 14 Oct 2009 21:41:14 +0000 (14 18:41 -0300) | ||
| tree | 0eaef2bba8c6a47c16bb6355f71317b872bab04c | treesnapshot (tar.gz zip) |
| parent | 6ca9781b5b84ee211798000276048f6e3dfd9bed | commitdiff |
| parent | af4ce882d530d4aa9ed26de3423a36e4a156d0a5 | commitdiff |
Merge commit 'af4ce882d530d4aa9ed26de3423a36e4a156d0a5' into upstream-merge
* commit 'af4ce882d530d4aa9ed26de3423a36e4a156d0a5':
monitor: union for command handlers
monitor: union for info handlers
Conflicts:
qemu-monitor.hx
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit 'af4ce882d530d4aa9ed26de3423a36e4a156d0a5':
monitor: union for command handlers
monitor: union for info handlers
Conflicts:
qemu-monitor.hx
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| monitor.c | diff1 | diff2 | blobhistory |
| qemu-monitor.hx | diff1 | diff2 | blobhistory |