Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 6327806 8d0d9b9)

commit	d2ac739384cb82c0af3398fb136f6fca37935d4d
author	Stefan Weil <sw@weilnetz.de>
	Fri, 22 Apr 2016 05:10:50 +0000 (22 07:10 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Fri, 22 Apr 2016 05:10:50 +0000 (22 07:10 +0200)
tree	732fa81ad38a89ed62c9dee110df5f6e830c0872	tree \| snapshot (tar.gz zip)
parent	6327806e6539f4bda4a49804cd1484fc206c840c	commit \| diff
parent	8d0d9b9f67d6bdee9eaec1e8c1222ad91dc4ac01	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
po/hu.po
po/tr.po

Signed-off-by: Stefan Weil <sw@weilnetz.de>

12 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
hw/arm/boot.c	diff1 \|	diff2 \|	blob \| history
hw/display/xenfb.c	diff1 \|	diff2 \|	blob \| history
po/de_DE.po	diff1 \|	diff2 \|	blob \| history
po/fr_FR.po	diff1 \|	diff2 \|	blob \| history
po/hu.po	diff1 \|	diff2 \|	blob \| history
po/it.po	diff1 \|	diff2 \|	blob \| history
po/tr.po	diff1 \|	diff2 \|	blob \| history
qemu-options.hx	diff1 \|	diff2 \|	blob \| history
tcg/i386/tcg-target.inc.c	diff1 \|	diff2 \|	blob \| history
tcg/tcg.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU