fix merge conflicts

This commit is contained in:
Nguyen Anh Quynh
2017-03-10 21:04:33 +08:00
41 changed files with 543 additions and 109 deletions

View File

@ -42,3 +42,18 @@ if test -e $DIR/sample_m68k; then
echo "=========================="
$DIR/sample_m68k
fi
if test -e $DIR/mem_apis; then
echo "=========================="
$DIR/mem_apis
fi
if test -e $DIR/sample_batch_reg; then
echo "=========================="
$DIR/sample_batch_reg
fi
if test -e $DIR/sample_x86_32_gdt_and_seg_regs; then
echo "=========================="
$DIR/sample_x86_32_gdt_and_seg_regs
fi