Merge branch 'master' of github.com:diasurgical/devilution

This commit is contained in:
Anders Jenbo 2020-03-29 23:40:05 +02:00
commit 776ab10476
116 changed files with 1840 additions and 1285 deletions

2
.gitignore vendored
View file

@ -430,3 +430,5 @@ DerivedData/
### Nintendo Switch ###
exefs/main
/out/isenseconfig/CPI-Debug
/docs/html/