955206aaf0
Conflicts: src/p_lx_elf.cpp src/stub/src/amd64-linux.elf-entry.S src/stub/src/amd64-linux.elf-main.c src/stub/src/arm.v4a-linux.elf-entry.S src/stub/src/arm.v4a-linux.elf-fold.S src/stub/src/arm64-linux.elf-entry.S src/stub/src/arm64-linux.elf-fold.S src/stub/src/i386-linux.elf-fold.S src/stub/src/powerpc-darwin.macho-entry.S src/stub/src/powerpc-linux.elf-fold.S src/stub/src/powerpc64le-darwin.macho-entry.S src/stub/src/powerpc64le-linux.elf-entry.S src/stub/src/powerpc64le-linux.elf-fold.S src/stub/src/powerpc64le-linux.elf-main.c Changes to be committed: modified: ../.github/ISSUE_TEMPLATE.md modified: ../.github/travis_build.sh modified: ../.github/travis_deploy.sh modified: ../.github/travis_init.sh modified: ../.github/travis_testsuite_1.sh modified: ../.gitignore modified: ../.travis.yml modified: ../NEWS modified: c_screen.cpp modified: file.cpp modified: help.cpp modified: linker.cpp modified: main.cpp modified: p_lx_elf.cpp modified: packer.cpp modified: s_djgpp2.cpp modified: stub/src/amd64-linux.elf-main.c modified: stub/src/arm.v4a-linux.elf-entry.S modified: stub/src/arm.v4a-linux.elf-fold.S modified: stub/src/arm64-linux.elf-entry.S modified: stub/src/arm64-linux.elf-fold.S modified: stub/src/i386-linux.elf-main.c modified: stub/src/powerpc-darwin.dylib-entry.S modified: stub/src/powerpc-darwin.macho-entry.S modified: stub/src/powerpc-darwin.macho-fold.S modified: stub/src/powerpc-linux.elf-fold.S modified: stub/src/powerpc64le-darwin.dylib-entry.S modified: stub/src/powerpc64le-darwin.macho-entry.S modified: stub/src/powerpc64le-darwin.macho-fold.S modified: stub/src/powerpc64le-linux.elf-entry.S modified: stub/src/powerpc64le-linux.elf-fold.S modified: stub/src/powerpc64le-linux.elf-main.c modified: ui.cpp modified: util.cpp modified: work.cpp [plus *.h, *.dump, *.map]