Block some files from being merged

This commit is contained in:
Robert de Rooy 2021-03-07 16:15:06 +01:00
parent cb19f71527
commit 7c698050bd

6
.gitignore vendored
View File

@ -329,6 +329,10 @@ windows-installer/DOSBox-X-standalone-*
windows-installer/DOSBox-X-setup-*.exe
windows-installer/DOSBox-X-setup-*.zip
make-rpm.sh
contrib/linux/dosbox-x.spec
contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml
\!DosBox-X/*,ff8
\!DosBox-X/CHANGELOG,fff
\!DosBox-X/resources/*
@ -391,4 +395,4 @@ vs2015/libpng/linux-build/*
/vs2015/libpdcurses/wincon/ozdemo.exe
/vs2015/libpdcurses/wincon/firework.exe
.vscode/settings.json
vs2015/freetype/objs
vs2015/freetype/objs