Merge remote-tracking branch 'stweil/hax-new'
commita7115d7f03de506d7bba14ac740d353ca3e97c09
authorStefan Weil <sw@weilnetz.de>
Mon, 19 Dec 2016 17:14:04 +0000 (19 18:14 +0100)
committerStefan Weil <sw@weilnetz.de>
Mon, 19 Dec 2016 17:14:04 +0000 (19 18:14 +0100)
tree11806726eb29554d505bd3149b6e020c552e2360
parent988b5eeb2dd8ec7156530d321f3ff42f7b5d26c3
parent87eaf94d112ebea3cab50ac7490e37fe57e41238
Merge remote-tracking branch 'stweil/hax-new'

# Conflicts:
# target-i386/Makefile.objs
# target-i386/hax-all.c
# target-i386/hax-i386.h
# target-i386/hax-interface.h
# target-i386/hax-windows.c

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