]> rtime.felk.cvut.cz Git - jailhouse.git/commitdiff
projects / jailhouse.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e0ea74 51f3bda)
Merge remote-tracking branch 'kiszka/master'
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Wed, 27 Jul 2016 14:56:47 +0000 (16:56 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Wed, 27 Jul 2016 14:56:47 +0000 (16:56 +0200)
# Conflicts:
# hypervisor/arch/x86/dbg-write.c -- solved, remote version was choosen.

1  2 
configs/qemu-vm.c patch | diff1 | diff2 | blob | history

diff --cc configs/qemu-vm.c
index c7ebd4d4679e4b8a0c0961d83b92d72965bf69b9,84e853c0460a6ddb2e7e32f85a111b616a320b31..7077fbd4a7ea219b567d0ceaf4dfe9b707a0b653
mode 100755,100644..100755
--- 1/configs/qemu-vm.c
--- 2/configs/qemu-vm.c
+++ b/configs/qemu-vm.c