Merge branch 'develop' into pentium-pro

This commit is contained in:
Zalka Ernő
2017-09-20 16:44:32 +02:00
committed by GitHub
45 changed files with 662 additions and 1812 deletions

10
.gitignore vendored
View File

@@ -311,14 +311,14 @@ dosbox.iconset/*
autom4te.cache/
autom4te.cache/*
.DS_Store
windows-installer/DOSBox-X-standalone-*
windows-installer/DOSBox-X-setup-*.exe
windows-installer/DOSBox-X-setup-*.zip
*.o
*.a
*.la
*.deps
dosbox-x
Makefile
p
s
config.h
config.status
stamp-h1