| commit | f91c063bc874f73ac1daec0c24a5b471cd49dc3d | |
| author | Stefan Weil <sw@weilnetz.de> | |
| Thu, 26 Nov 2015 19:33:15 +0000 (26 20:33 +0100) | ||
| committer | Stefan Weil <sw@weilnetz.de> | |
| Thu, 26 Nov 2015 19:33:15 +0000 (26 20:33 +0100) | ||
| tree | a216e74481e8f0a273ffaf055a63cd083521c976 | treesnapshot (tar.gz zip) |
| parent | a7015e148f0e13f5984e0d1dcb6a88196e35a783 | commitdiff |
| parent | b04fc428356a540fdb9065fa8c3c71ee476c2031 | commitdiff |
Merge remote-tracking branch 'qemu/master'
Conflicts:
Makefile
qobject/json-parser.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Conflicts:
Makefile
qobject/json-parser.c
Signed-off-by: Stefan Weil <sw@weilnetz.de>
20 files changed: