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

This commit is contained in:
Anders Jenbo 2019-04-05 15:21:53 +02:00
commit a907a4d49b
70 changed files with 16505 additions and 18735 deletions

14
.gitignore vendored
View file

@ -1,5 +1,19 @@
# Generated by VC++ 6 builds
/vc60.idb
*.asm
*.idb
# macOS
.DS_Store
# CodeLite
.CodeLite
*.project
*.workspace
# Devilution Comparer
devilution-comparer
comparer-config.toml
#ignore cmake cache
/build/