Merge remote-tracking branch 'qemu/master'
commit4f942bad4af460d74b350d4b87553e17e036e9d9
authorStefan Weil <sw@weilnetz.de>
Sun, 13 Apr 2014 15:54:36 +0000 (13 17:54 +0200)
committerStefan Weil <sw@weilnetz.de>
Sun, 13 Apr 2014 15:54:36 +0000 (13 17:54 +0200)
tree5702e9e1d49990b93eda18c57d8ed8eacf74972b
parentdad8f4042a8b4c25e1491896b86f8bfb4a97191b
parent92b3eeadd9bc72f1f4e5ba1f62a289dc0190e88f
Merge remote-tracking branch 'qemu/master'
configure
qom/object.c