Public Git Hosting - qemu/ar7.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 240be47 015a33b)

commit	e560eedd429a38a83d2d83154b1f81573761f03a
author	Stefan Weil <sw@weilnetz.de>
	Tue, 1 Jul 2014 17:49:04 +0000 (1 19:49 +0200)
committer	Stefan Weil <sw@weilnetz.de>
	Tue, 1 Jul 2014 17:49:04 +0000 (1 19:49 +0200)
tree	1738e07c5077aa28bd7cc9094103e0a24bfafb10	tree \| snapshot (tar.gz zip)
parent	240be47a8d96bfae26b6317f5d24527abf07da3a	commit \| diff
parent	015a33bd05b7fd69f400d4e0e4a9925af9292548	commit \| diff

Merge remote-tracking branch 'qemu/master'

Conflicts:
ui/vnc.h

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

14 files changed:

Makefile.target	diff1 \|	diff2 \|	blob \| history
block.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
exec.c	diff1 \|	diff2 \|	blob \| history
hw/sh4/sh7750.c	diff1 \|	diff2 \|	blob \| history
include/block/block_int.h	diff1 \|	diff2 \|	blob \| history
include/qom/object.h	diff1 \|	diff2 \|	blob \| history
memory.c	diff1 \|	diff2 \|	blob \| history
qemu-doc.texi	diff1 \|	diff2 \|	blob \| history
qom/object.c	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history
ui/vnc.c	diff1 \|	diff2 \|	blob \| history
ui/vnc.h	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

AR7 emulation for QEMU