Skip to content

86Box nightly – autobuild-c2e65e8

Choose a tag to compare

@github-actions github-actions released this 22 Dec 19:40
· 1980 commits to master since this release
Merge upstream/master and resolve conflicts

Resolved merge conflicts in:
- .github/workflows/cmake_macos.yml: Keep separate x86_64/arm64 jobs
- src/cpu/386_dynarec.c: Accept upstream refactoring (removed ndr_virtualize_mode branch)
- src/floppy/fdc.c: Accept upstream refactoring
- src/floppy/fdd.c: Accept upstream enhanced audio/turbo handling
- src/qt/qt_mainwindow.cpp: Keep both forward declarations and extern
- src/unix/unix.c: Keep macOS-specific ROM path listing with EMU_NAME_W

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>