| commit | e4427ca3b128601477b5d609fbeb7826ed90b0c3 | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Mon, 23 Sep 2013 20:26:23 +0000 (23 22:26 +0200) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Mon, 23 Sep 2013 20:26:23 +0000 (23 22:26 +0200) | ||
| tree | 93df88be5230734e684a2cb073b6b7a4f67e2048 | treesnapshot (tar.gz zip) |
| parent | 9fe14bc6cf713ed7aa879a9e05342d2ca841a88e | commitdiff |
| parent | f828a4c8faa118e0ebab3e353ac6840f3b2a0318 | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
Makefile
qemu-timer.c
+ api fixes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
Makefile
qemu-timer.c
+ api fixes.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
15 files changed: